Merge branch 'x86/cpu' into perf/core

Merge this branch because we changed the wrmsr*_safe() API and there's
a conflict.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

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

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

diff --cc arch/x86/kernel/cpu/perf_event.c
Simple merge

diff --cc arch/x86/kernel/cpu/perf_event_intel.c
Simple merge

diff --cc arch/x86/xen/enlighten.c
Simple merge