Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood...
authorMichael Ellerman <mpe@ellerman.id.au>
Fri, 17 Apr 2015 01:22:51 +0000 (11:22 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Fri, 17 Apr 2015 01:22:51 +0000 (11:22 +1000)
commit1cbee462a5afc1cc30389915b3d18bdcb3c47ad6
treeb1e2b5836e52788c356c21efe716f6faa694c823
parentd19d5efd8c8840aa4f38a6dfbfe500d8cc27de46
parent50c6a665b383cb5839e45d04e36faeeefaffa052
Merge branch 'master' of git://git./linux/kernel/git/scottwood/linux into fixes
arch/powerpc/mm/hugetlbpage.c