Merge branch 'x86/cpu' into perf/core
authorIngo Molnar <mingo@kernel.org>
Thu, 5 Jul 2012 19:12:11 +0000 (21:12 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 5 Jul 2012 19:12:11 +0000 (21:12 +0200)
commitb0338e99b2a775c157e3e795f49fdcfb6c257f7a
tree59573cd20718ebb5145b05938ef3fb428bde65c7
parent90574ebb7e6e0f7f74636ee87315890ba88d6a4a
parent715c85b1fc824e9cd0ea07d6ceb80d2262f32e90
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>
arch/x86/include/asm/msr.h
arch/x86/include/asm/paravirt.h
arch/x86/kernel/cpu/perf_event.c
arch/x86/kernel/cpu/perf_event_intel.c
arch/x86/xen/enlighten.c