From: Ingo Molnar Date: Thu, 5 Jul 2012 19:12:11 +0000 (+0200) Subject: Merge branch 'x86/cpu' into perf/core X-Git-Tag: firefly_0821_release~3680^2~2423^2~19 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b0338e99b2a775c157e3e795f49fdcfb6c257f7a;p=firefly-linux-kernel-4.4.55.git 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 --- b0338e99b2a775c157e3e795f49fdcfb6c257f7a