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)
commitd630ba565f3d806d64df4415d4a8457b4ab23db6
treee17a7699cc82b602b32ed27ce032a4a2fcc580f3
parent5fd862f1db941c302a872ed7e67eab593a6a931a
parent6a469e4665bc158599de55d64388861d0a9f10f4
Merge branch 'x86-uv-for-linus' of git://git./linux/kernel/git/tip/tip

* '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)
arch/x86/include/asm/uv/uv_bau.h
arch/x86/kernel/apic/x2apic_uv_x.c