From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 2 Jul 2013 23:33:05 +0000 (-0700)
Subject: Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.12-rc1~528
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7c6809ff2bd63d4c97ce9e0b94d39d5180842c48;p=kernel%2Fkernel-generic.git

Merge branch 'x86-uv-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 UV update from Ingo Molnar:
 "There's a single commit in this tree, which adds support for a new SGI
  UV GRU (Global Reference Unit - fast NUMA messaging ASIC) hardware
  feature to scale up and beyond: an optional distributed mode that will
  allow per-node address mapping of local GRU space, as opposed to
  mapping all GRU hardware to the same contiguous high space"

* 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/UV: Add GRU distributed mode mappings
---

7c6809ff2bd63d4c97ce9e0b94d39d5180842c48