Merge branch 'merge' into release-2.6.27
authorAndi Kleen <ak@linux.intel.com>
Thu, 17 Jul 2008 23:43:31 +0000 (01:43 +0200)
committerAndi Kleen <ak@linux.intel.com>
Thu, 17 Jul 2008 23:43:31 +0000 (01:43 +0200)

Trivial merge