author | Linus Torvalds <torvalds@linux-foundation.org> | |
Tue, 18 May 2010 16:46:35 +0000 (09:46 -0700) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Tue, 18 May 2010 16:46:35 +0000 (09:46 -0700) |
* 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, UV: uv_irq.c: Fix all sparse warnings
x86, UV: Improve BAU performance and error recovery
x86, UV: Delete unneeded boot messages
x86, UV: Clean up UV headers for MMR definitions
x86, UV: uv_irq.c: Fix all sparse warnings
x86, UV: Improve BAU performance and error recovery
x86, UV: Delete unneeded boot messages
x86, UV: Clean up UV headers for MMR definitions
1 | 2 | |||
---|---|---|---|---|
arch/x86/kernel/apic/x2apic_uv_x.c | patch | | diff1 | | diff2 | | blob | history |
arch/x86/kernel/tlb_uv.c | patch | | diff1 | | diff2 | | blob | history |
arch/x86/kernel/uv_irq.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc arch/x86/kernel/apic/x2apic_uv_x.c
Simple merge
diff --cc arch/x86/kernel/tlb_uv.c
Simple merge
diff --cc arch/x86/kernel/uv_irq.c
Simple merge