Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 29 May 2011 18:18:09 +0000 (11:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 29 May 2011 18:18:09 +0000 (11:18 -0700)
commitf310642123e0d32d919c60ca3fab5acd130c4ba3
treef3844152e2e8c0fdd01621a400f84c8a159252a0
parentef1d57599dc904fdb31b8e9b5336350d21a1fde1
parent5d4c47e0195b989f284907358bd5c268a44b91c7
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:
  x86 idle: deprecate mwait_idle() and "idle=mwait" cmdline param
  x86 idle: deprecate "no-hlt" cmdline param
  x86 idle APM: deprecate CONFIG_APM_CPU_IDLE
  x86 idle floppy: deprecate disable_hlt()
  x86 idle: EXPORT_SYMBOL(default_idle, pm_idle) only when APM demands it
  x86 idle: clarify AMD erratum 400 workaround
  idle governor: Avoid lock acquisition to read pm_qos before entering idle
  cpuidle: menu: fixed wrapping timers at 4.294 seconds
Documentation/feature-removal-schedule.txt
arch/x86/include/asm/acpi.h
arch/x86/include/asm/processor.h
arch/x86/kernel/apm_32.c
arch/x86/kernel/cpu/common.c
arch/x86/kernel/process.c
arch/x86/kernel/smpboot.c
drivers/block/floppy.c
kernel/pm_qos_params.c