]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
git://bbs.cooldavid.org / net-next-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 709d9f5 fa47f7e)
Merge branch 'x86-x2apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Oct 2010 20:54:05 +0000 (13:54 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Oct 2010 20:54:05 +0000 (13:54 -0700)
* 'x86-x2apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, x2apic: Simplify apic init in SMP and UP builds
  x86, intr-remap: Remove IRTE setup duplicate code
  x86, intr-remap: Set redirection hint in the IRTE

1  2 
arch/x86/kernel/apic/io_apic.c patch | diff1 | diff2 | blob | history
arch/x86/kernel/smpboot.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/kernel/apic/io_apic.c
Simple merge
diff --cc arch/x86/kernel/smpboot.c
Simple merge
Clone of davem's net-next-2.6 tree