From: Catalin Marinas <catalin.marinas@arm.com>
Date: Mon, 1 Jul 2013 10:20:58 +0000 (+0100)
Subject: Merge branch 'for-next/hugepages' of git://git.linaro.org/people/stevecapper/linux... 
X-Git-Tag: omap-for-v3.11/fixes-for-merge-window~40^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa729dccb5e8dfbc78e2e235b8754d6acccee731;p=pandora-kernel.git

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
---

aa729dccb5e8dfbc78e2e235b8754d6acccee731
Reading git-diff-tree failed