Catalin Marinas aa729dccb5 Merge branch 'for-next/hugepages' of git://git.linaro.org/people/stevecapper/linux into upstream-hugepages ... * 'for-next/hugepages' of git://git.linaro.org/people/stevecapper/linux: ARM64: mm: THP support. ARM64: mm: Raise MAX_ORDER for 64KB pages and THP. ARM64: mm: HugeTLB support. ARM64: mm: Move PTE_PROT_NONE bit. ARM64: mm: Make PAGE_NONE pages read only and no-execute. ARM64: mm: Restore memblock limit when map_mem finished. mm: thp: Correct the HPAGE_PMD_ORDER check. x86: mm: Remove general hugetlb code from x86. mm: hugetlb: Copy general hugetlb code from x86 to mm. x86: mm: Remove x86 version of huge_pmd_share. mm: hugetlb: Copy huge_pmd_share from x86 to mm. Conflicts: arch/arm64/Kconfig arch/arm64/include/asm/pgtable-hwdef.h arch/arm64/include/asm/pgtable.h		2013-07-01 11:20:58 +01:00
..
boot	arm64: Add initial DTS for APM X-Gene Storm SOC and APM Mustang board	2013-06-20 17:03:59 +01:00
configs	arm64: Enable APM X-Gene SOC family in the defconfig	2013-06-20 17:03:59 +01:00
include	Merge branch 'for-next/hugepages' of git://git.linaro.org/people/stevecapper/linux into upstream-hugepages	2013-07-01 11:20:58 +01:00
kernel	Merge branch 'kvm-arm64/kvm-for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into upstream	2013-06-12 16:48:38 +01:00
kvm	arm64: KVM: enable initialization of a 32bit vcpu	2013-06-12 16:42:18 +01:00
lib	arm64: Treat the bitops index argument as an 'int'	2013-05-08 10:33:17 +01:00
mm	Merge branch 'for-next/hugepages' of git://git.linaro.org/people/stevecapper/linux into upstream-hugepages	2013-07-01 11:20:58 +01:00
xen	arm64/xen: introduce CONFIG_XEN and hypercall.S on ARM64	2013-06-07 10:39:52 +00:00
Kconfig	Merge branch 'for-next/hugepages' of git://git.linaro.org/people/stevecapper/linux into upstream-hugepages	2013-07-01 11:20:58 +01:00
Kconfig.debug	arm64: Kconfig.debug: Remove unused CONFIG_DEBUG_ERRORS	2013-03-19 16:19:19 +00:00
Makefile	arm64/Makefile: provide vdso_install target	2013-06-19 17:54:06 +01:00