git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5fd862f 6a469e4)
Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 28 Oct 2011 12:43:56 +0000 (05:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 28 Oct 2011 12:43:56 +0000 (05:43 -0700)
* 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: uv2: Workaround for UV2 Hub bug (system global address format)

1  2 
arch/x86/include/asm/uv/uv_bau.h patch | diff1 | diff2 | blob | history
arch/x86/kernel/apic/x2apic_uv_x.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/include/asm/uv/uv_bau.h
Simple merge
diff --cc arch/x86/kernel/apic/x2apic_uv_x.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.