From: Linus Torvalds Date: Wed, 20 Feb 2013 04:12:57 +0000 (-0800) Subject: Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: firefly_0821_release~3680^2~1114 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1a13c0b181f218bf56a1a6b8edbaf2876b22314b;p=firefly-linux-kernel-4.4.55.git Merge branch 'x86-uv-for-linus' of git://git./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) --- 1a13c0b181f218bf56a1a6b8edbaf2876b22314b