From: Ingo Molnar Date: Tue, 14 Jun 2016 10:25:07 +0000 (+0200) Subject: Merge branch 'x86/cpu' into x86/platform, to avoid conflict X-Git-Tag: v4.8-rc1~174^2~13 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6f4bbc997ed23540d23ff3f073dd1ac091c6984;p=thirdparty%2Fkernel%2Fstable.git Merge branch 'x86/cpu' into x86/platform, to avoid conflict Signed-off-by: Ingo Molnar --- f6f4bbc997ed23540d23ff3f073dd1ac091c6984