Merge branch 'linus' into idle-test
Len Brown [Wed, 12 Jan 2011 23:06:06 +0000 (18:06 -0500)]
1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge