]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'booke-hugetlb' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 8 Dec 2011 02:20:34 +0000 (13:20 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 8 Dec 2011 02:20:34 +0000 (13:20 +1100)

Trivial merge