Merge branches 'release', 'cpuidle-2.6.25' and 'idle' into release
authorLen Brown <len.brown@intel.com>
Thu, 7 Feb 2008 08:11:05 +0000 (03:11 -0500)
committerLen Brown <len.brown@intel.com>
Thu, 7 Feb 2008 08:11:05 +0000 (03:11 -0500)
commitacf63867ae06ef95eea7bf445ded2f05528a81b1
tree35f65ce7d7520b9c4920086382f1838107f836ca
parentc64768a7d671bcde80bca2aed93f9e07edc069c3
parentf757397097d0713c949af76dccabb65a2785782e
parent9a0b841586c3c6c846effdbe75885c2ebc0031b0
Merge branches 'release', 'cpuidle-2.6.25' and 'idle' into release
arch/x86/Kconfig
drivers/acpi/processor_idle.c
drivers/cpuidle/cpuidle.c
include/linux/cpuidle.h