]> 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>
Fri, 28 Jun 2013 06:17:57 +0000 (16:17 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 06:17:57 +0000 (16:17 +1000)
commit7431e09777a6df51327c7b3122263a28e246d25f
treef051ee30cf95b358ded4ce421004e6f04a7417ed
parent821b92fe8809bcaf66439e53c4787bfade0ba35c
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
include/linux/huge_mm.h
include/linux/hugetlb.h
mm/hugetlb.c