projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c183a60 c291b01)
Merge branch 'x86/urgent' into x86/apic
authorThomas Gleixner <tglx@linutronix.de>
Mon, 26 Sep 2016 19:47:03 +0000 (15:47 -0400)
committerThomas Gleixner <tglx@linutronix.de>
Mon, 26 Sep 2016 19:47:03 +0000 (15:47 -0400)
Bring in the upstream modifications so we can fixup the silent merge
conflict which is introduced by this merge.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
1  2 
arch/x86/kernel/apic/apic.c patch | diff1 | diff2 | blob | history
arch/x86/kernel/smpboot.c patch | diff1 | diff2 | blob | history
include/linux/acpi.h patch | diff1 | diff2 | blob | history

diff --cc arch/x86/kernel/apic/apic.c
Simple merge
diff --cc arch/x86/kernel/smpboot.c
Simple merge
diff --cc include/linux/acpi.h
Simple merge