From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 3 Jun 2014 22:48:23 +0000 (-0700)
Subject: Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: next-20140604~107^2
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=3de0ef8d0d3350964720cad2a0a72984f1bb81ba;p=karo-tx-linux.git

Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next

Pull x86/UV changes from Ingo Molnar:
 "Continued updates for SGI UV 3 hardware support"

* 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/UV: Fix conditional in gru_exit()
  x86/UV: Set n_lshift based on GAM_GR_CONFIG MMR for UV3
---

3de0ef8d0d3350964720cad2a0a72984f1bb81ba