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)
Merge this branch because we changed the wrmsr*_safe() API and there's
a conflict.

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

Trivial merge