From: Thomas Gleixner Date: Fri, 25 Aug 2017 06:56:22 +0000 (+0200) Subject: Merge branch 'x86/asm' into x86/apic X-Git-Tag: v4.14-rc1~156^2~51 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c0bb80cfa3c37fd92f066e328d83656067519a5f;p=users%2Fjedix%2Flinux-maple.git Merge branch 'x86/asm' into x86/apic Pick up dependent changes to avoid merge conflicts --- c0bb80cfa3c37fd92f066e328d83656067519a5f