]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit2556c613deac94abf16f7eb76b22ac5a915cc72c
tree2b1429170872fce52b88f48cdef565d104fdf1df
parent77b4f10d3e085c2a020ceb66ad26d33a3b2b5d6d
parente59c9888e32efa1e3b02571dc49302d65c398107
Merge branch 'merge' of git://git.kernel.org/pub/scm/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