]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 06b77b9 fe455b1)
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)
commit3de0ef8d0d3350964720cad2a0a72984f1bb81ba
tree86af0fe2a66c9975d9740e82a7ae1530280b8b38tree | snapshot
parent06b77b97338e906e8af73a9b5f97b9162aac239dcommit | diff
parentfe455b17de6c881eecf4f9784c3b0483a5e3d19ecommit | 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 for KaRo TX COM modules