aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds2013-02-19 20:12:57 -0800
committerLinus Torvalds2013-02-19 20:12:57 -0800
commit1a13c0b181f218bf56a1a6b8edbaf2876b22314b (patch)
treea7e2442b591cef28730dc6a4e54a6976e7719d3d /net
parentf98982ce80f9ce6db0fe841c1844cbae0a2700fb (diff)
parentd924f947a44684796eee6fa488a9fe7876923c3b (diff)
Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 UV3 support update from Ingo Molnar: "Support for the SGI Ultraviolet System 3 (UV3) platform - the upcoming third major iteration and upscaling of the SGI UV supercomputing platform." * 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86, uv, uv3: Trim MMR register definitions after code changes for SGI UV3 x86, uv, uv3: Check current gru hub support for SGI UV3 x86, uv, uv3: Update Time Support for SGI UV3 x86, uv, uv3: Update x2apic Support for SGI UV3 x86, uv, uv3: Update Hub Info for SGI UV3 x86, uv, uv3: Update ACPI Check to include SGI UV3 x86, uv, uv3: Update MMR register definitions for SGI Ultraviolet System 3 (UV3)
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions