From: Thomas Gleixner Date: Mon, 26 Sep 2016 19:47:03 +0000 (-0400) Subject: Merge branch 'x86/urgent' into x86/apic X-Git-Tag: v4.9-rc1~161^2~1 X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=1e1b37273cf719545da50b76f214f983a710aaf4 Merge branch 'x86/urgent' into x86/apic Bring in the upstream modifications so we can fixup the silent merge conflict which is introduced by this merge. Signed-off-by: Thomas Gleixner --- 1e1b37273cf719545da50b76f214f983a710aaf4