| commit | 53d5defcfa8c9603554a3174cbe206fb69f6e8ef | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jun 20 08:08:46 2013 -1000 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jun 20 08:08:46 2013 -1000 |
| tree | 2b1429170872fce52b88f48cdef565d104fdf1df | |
| parent | f92d0dc95d137c0abe7d1478d6e7d2cf4ca5fce8 [diff] | |
| parent | 8bbd9f04b7d982d1c6aeb5c08f5983b3d0b9e2fe [diff] |
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