tree 468edefc99809bbea6eb087d36faf0a4652e7abf
parent 96a3d998fb92c28b9862297fcf93a24d8a0eac1d
parent 879d5ad0dc3b096170c8f985b1465de5dca88de8
author Linus Torvalds <torvalds@linux-foundation.org> 1372807985 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1372807985 -0700

Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/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