]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'arm64-hugepages/for-next/hugepages'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 06:53:49 +0000 (16:53 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 06:53:49 +0000 (16:53 +1000)
commit6b455b44582515475a1af8394bd8e0698517d097
tree5815c14b1595175bedda9c6c8af171cb1a1d82aa
parentce3ae88721c7899142776e0258f19a7ce56c9965
parentaf07484863e0c20796081e57093886c22dc16705
Merge remote-tracking branch 'arm64-hugepages/for-next/hugepages'

Conflicts:
arch/arm64/Kconfig
arch/arm64/include/asm/pgtable-hwdef.h
arch/arm64/include/asm/pgtable.h
arch/arm64/Kconfig
arch/arm64/include/asm/pgtable-hwdef.h
arch/arm64/include/asm/pgtable.h
arch/arm64/mm/mmu.c
arch/x86/Kconfig
mm/hugetlb.c