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: rel_imx_4.19.35_1.1.0~14514^2~13 X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=f6f4bbc997ed23540d23ff3f073dd1ac091c6984;p=linux.git Merge branch 'x86/cpu' into x86/platform, to avoid conflict Signed-off-by: Ingo Molnar --- f6f4bbc997ed23540d23ff3f073dd1ac091c6984