Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 28 May 2010 23:14:17 +0000 (16:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 28 May 2010 23:14:17 +0000 (16:14 -0700)
commite4f2e5eaac8f5f903ca4a8cc944d26e68745d6bb
tree1a8d89561fa5b231202d5287acc2683eccadee7f
parent9a90e09854a3c7cc603ab8fc9163f77bb1f66cfa
parent2671717265ae6e720a9ba5f13fbec3a718983b65
Merge branch 'idle-release' of git://git./linux/kernel/git/lenb/linux-idle-2.6

* 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6:
  intel_idle: native hardware cpuidle driver for latest Intel processors
  ACPI: acpi_idle: touch TS_POLLING only in the non-MWAIT case
  acpi_pad: uses MONITOR/MWAIT, so it doesn't need to clear TS_POLLING
  sched: clarify commment for TS_POLLING
  ACPI: allow a native cpuidle driver to displace ACPI
  cpuidle: make cpuidle_curr_driver static
  cpuidle: add cpuidle_unregister_driver() error check
  cpuidle: fail to register if !CONFIG_CPU_IDLE
MAINTAINERS
arch/x86/include/asm/thread_info.h
drivers/acpi/acpi_pad.c
drivers/acpi/processor_idle.c