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)
Pick up dependent changes to avoid merge conflicts

1  2 
MAINTAINERS
arch/x86/Kconfig
arch/x86/include/asm/elf.h
lib/Kconfig.debug

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge