Merge branch 'x86/asm' into x86/apic
authorThomas Gleixner <tglx@linutronix.de>
Fri, 25 Aug 2017 06:56:22 +0000 (08:56 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Fri, 25 Aug 2017 06:56:22 +0000 (08:56 +0200)
commitc0bb80cfa3c37fd92f066e328d83656067519a5f
treefad29579615daaf7d36364e4b45702db0c709044
parentadfaf18334cbf16c563e4ebc67e968ea1b17ec51
parentecda85e70277ef24e44a1f6bc00243cebd19f985
Merge branch 'x86/asm' into x86/apic

Pick up dependent changes to avoid merge conflicts
MAINTAINERS
arch/x86/Kconfig
arch/x86/include/asm/elf.h
lib/Kconfig.debug