Merge branch 'cpuidle-perf-events' into idle-test

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

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

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