Merge branch 'linus' into idle-test

diff --cc arch/arm/mach-omap2/cpuidle34xx.c
Simple merge

diff --cc arch/x86/include/asm/processor.h
Simple merge

diff --cc arch/x86/kernel/process.c
Simple merge

diff --cc drivers/acpi/processor_idle.c
Simple merge

diff --cc drivers/cpuidle/cpuidle.c
Simple merge

diff --cc drivers/idle/intel_idle.c
Simple merge