projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit1e1b37273cf719545da50b76f214f983a710aaf4
tree033f6062325ef7aaeefe8559bb409ab7d2be3c76tree | snapshot
parentc183a603e8d8a5a189729b77d0c623a3d5950e5fcommit | diff
parentc291b015158577be533dd5a959dfc09bab119eedcommit | diff
Merge branch 'x86/urgent' into x86/apic

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>
arch/x86/kernel/apic/apic.c diff1 | diff2 | blob | history
arch/x86/kernel/smpboot.c diff1 | diff2 | blob | history
include/linux/acpi.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.