Merge branch 'cpuidle' into release-2.6.27
authorAndi Kleen <ak@linux.intel.com>
Fri, 15 Aug 2008 19:26:12 +0000 (21:26 +0200)
committerAndi Kleen <ak@linux.intel.com>
Fri, 15 Aug 2008 19:26:12 +0000 (21:26 +0200)

Trivial merge