projects / profile / common / kernel-common.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f92d0dc 8bbd9f0)
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 Jun 2013 18:08:46 +0000 (08:08 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 Jun 2013 18:08:46 +0000 (08:08 -1000)
commit53d5defcfa8c9603554a3174cbe206fb69f6e8ef
tree2b1429170872fce52b88f48cdef565d104fdf1dftree | snapshot
parentf92d0dc95d137c0abe7d1478d6e7d2cf4ca5fce8commit | diff
parent8bbd9f04b7d982d1c6aeb5c08f5983b3d0b9e2fecommit | diff
Merge branch 'merge' of git://git./linux/kernel/git/benh/powerpc

Pull powerpc fix fro, Benjamin Herrenschmidt:
 "We accidentally broke hugetlbfs on Freescale embedded processors which
  use a slightly different page table layout than our server processors"

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc: Fix bad pmd error with book3E config
Domain: SCM / Uncategorized;