summaryrefslogtreecommitdiff
path: root/include/linux/hugetlb.h
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2013-04-24 08:11:20 +0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2013-04-24 08:11:20 +0400
commit973e2abd15326114ff9a099d6dfe0ef6be6fc7e6 (patch)
tree06ef7573e06500a4999a755006eb9a95bdf85ffa /include/linux/hugetlb.h
parent5676005acf26ab7e924a8438ea4746e47d405762 (diff)
parent016af59f0f8cd10f27773df8f0034b5f3b46a138 (diff)
downloadlinux-973e2abd15326114ff9a099d6dfe0ef6be6fc7e6.tar.xz
Merge remote-tracking branch 'mpe/master' into next
Merge the tentative powerpc-next branch maintained by Michael while I was on vacation
Diffstat (limited to 'include/linux/hugetlb.h')
0 files changed, 0 insertions, 0 deletions