]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
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)
1  2 
arch/powerpc/mm/hugetlbpage.c

Simple merge