Merge branch 'release-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/ak...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Aug 2008 19:47:16 +0000 (12:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Aug 2008 19:47:16 +0000 (12:47 -0700)
commit40a342664078ebcb4006a89af96f7982fac36032
treee8bcaac5a116ab9a95ffa5d04046b0aa2159d59e
parent4ad193b43f6da6f15e19eda338c71e5b41383912
parent22d9aac23562ea0e921db152f11cf39e3c2b9945
Merge branch 'release-2.6.27' of git://git./linux/kernel/git/ak/linux-acpi-2.6

* 'release-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-acpi-2.6:
  cpuidle: Make ladder governor honor latency requirements fully
  cpuidle: Menu governor fix wrong usage of measured_us
  cpuidle: Do not use poll_idle unless user asks for it
  x86: Fix ioremap off by one BUG