projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: adfaf18 ecda85e)
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 patch | diff1 | diff2 | blob | history
arch/x86/Kconfig patch | diff1 | diff2 | blob | history
arch/x86/include/asm/elf.h patch | diff1 | diff2 | blob | history
lib/Kconfig.debug patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc arch/x86/Kconfig
Simple merge
diff --cc arch/x86/include/asm/elf.h
Simple merge
diff --cc lib/Kconfig.debug
Simple merge
Domain: System / Kernel;