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

..

alpha

Removal of GENERIC_GPIO for v3.10

2013-05-09 09:59:16 -07:00

arc

ARC: lazy dcache flush broke gdb in non-aliasing configs

2013-05-25 14:15:55 +05:30

arm

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

arm64

Merge branch 'for-next/hugepages' of git://git.linaro.org/people/stevecapper/linux into upstream-hugepages

2013-07-01 11:20:58 +01:00

avr32

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32

2013-05-22 18:06:57 -07:00

blackfin

blackfin updates for Linux 3.10

2013-05-10 07:21:16 -07:00

c6x

dump_stack: unify debug information printed by show_regs()

2013-04-30 17:04:02 -07:00

cris

- Lots of cleanups from Artem, including deletion of some obsolete drivers

2013-05-09 10:15:46 -07:00

frv

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2013-05-01 14:08:52 -07:00

h8300

We get rid of the general module prefix confusion with a binary config option,

2013-05-05 10:58:06 -07:00

hexagon

Removal of GENERIC_GPIO for v3.10

2013-05-09 09:59:16 -07:00

ia64

Removal of GENERIC_GPIO for v3.10

2013-05-09 09:59:16 -07:00

m32r

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2013-05-01 14:08:52 -07:00

m68k

m68k: Update defconfigs for v3.9

2013-05-28 10:22:06 +02:00

metag

Removal of GENERIC_GPIO for v3.10

2013-05-09 09:59:16 -07:00

microblaze

microblaze: Reversed logic in futex cmpxchg

2013-05-27 12:29:35 +02:00

mips

USB fixes for 3.10-rc2

2013-05-23 09:23:32 -07:00

mn10300

MN10300: Need pci_iomap() and __pci_ioport_map() defining

2013-05-30 13:38:48 +09:00

openrisc

Removal of GENERIC_GPIO for v3.10

2013-05-09 09:59:16 -07:00

parisc

parisc: kernel: using strlcpy() instead of strcpy()

2013-06-01 14:29:01 +02:00

powerpc

powerpc/cputable: Fix typo on P7+ cputable entry

2013-06-01 09:30:03 +10:00

s390

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

2013-05-21 09:36:46 -07:00

score

score: remove redundant kcore_list entries

2013-05-25 10:27:27 -07:00

sh

Removal of GENERIC_GPIO for v3.10

2013-05-09 09:59:16 -07:00

sparc

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

2013-05-10 09:21:05 -07:00

tile

Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

2013-05-09 14:34:58 -07:00

um

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2013-05-07 15:14:53 -07:00

unicore32

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

2013-05-10 09:21:05 -07:00

x86

x86: mm: Remove general hugetlb code from x86.

2013-06-14 09:40:15 +01:00

xtensa

Xtensa patchset for v3.10-rc1

2013-05-09 14:38:16 -07:00

.gitignore

…

Kconfig

Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2013-05-15 14:04:00 -07:00