diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-20 08:08:46 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-20 08:08:46 -1000 |
| commit | 53d5defcfa8c9603554a3174cbe206fb69f6e8ef (patch) | |
| tree | 2b1429170872fce52b88f48cdef565d104fdf1df /fs/xfs/xfs_trans_inode.c | |
| parent | f92d0dc95d137c0abe7d1478d6e7d2cf4ca5fce8 (diff) | |
| parent | 8bbd9f04b7d982d1c6aeb5c08f5983b3d0b9e2fe (diff) | |
| download | linux-53d5defcfa8c9603554a3174cbe206fb69f6e8ef.tar.gz linux-53d5defcfa8c9603554a3174cbe206fb69f6e8ef.tar.bz2 linux-53d5defcfa8c9603554a3174cbe206fb69f6e8ef.zip | |
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
Diffstat (limited to 'fs/xfs/xfs_trans_inode.c')
0 files changed, 0 insertions, 0 deletions