projects / platform / kernel / kernel-mfld-blackbay.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b683de2 fa47f7e)
Merge branch 'x86/x2apic' into irq/sparseirq
authorThomas Gleixner <tglx@linutronix.de>
Tue, 12 Oct 2010 14:39:44 +0000 (16:39 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Tue, 12 Oct 2010 14:39:53 +0000 (16:39 +0200)
Reason: Avoid conflicts with the x2apic modifications

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

diff --cc arch/x86/kernel/apic/io_apic.c
Simple merge
Domain: System / Uncategorized;