Merge branch 'linus' into idle-test
authorLen Brown <len.brown@intel.com>
Wed, 12 Jan 2011 23:06:06 +0000 (18:06 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 12 Jan 2011 23:06:06 +0000 (18:06 -0500)
commit56dbed129df3fdd4caf9018b6e7599ee258a5420
treeb902491aef3a99efe0d9d49edd0f6e414dba654f
parent2a2d31c8dc6f1ebcf5eab1d93a0cb0fb4ed57c7c
parentf878133bf022717b880d0e0995b8f91436fd605c
Merge branch 'linus' into idle-test
arch/arm/mach-omap2/cpuidle34xx.c
arch/x86/include/asm/processor.h
arch/x86/kernel/process.c
drivers/acpi/processor_idle.c
drivers/cpuidle/cpuidle.c
drivers/idle/intel_idle.c