]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9970f17 1e12e01)
Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 3 Jun 2014 22:48:23 +0000 (15:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 3 Jun 2014 22:48:23 +0000 (15:48 -0700)
commit15edb08f9843da9636d072d04b482548aab243e3
tree86af0fe2a66c9975d9740e82a7ae1530280b8b38tree | snapshot
parent9970f17955155021040e83950de2c074aac8bc00commit | diff
parent1e12e017fdc0dc24429a9e3936b5afb76a40085bcommit | diff
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
Linux Kernel Source Tree.