linux/arch
Ingo Molnar fb10d5b7ef Merge branch 'linus' into sched/core
Resolve cherry-picking conflicts:

Conflicts:
	mm/huge_memory.c
	mm/memory.c
	mm/mprotect.c

See this upstream merge commit for more details:

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

Signed-off-by: Ingo Molnar <mingo@kernel.org>
2013-11-01 08:24:41 +01:00
..
alpha
arc Merge branch 'linus' into sched/core 2013-11-01 08:24:41 +01:00
arm Merge branch 'linus' into sched/core 2013-11-01 08:24:41 +01:00
arm64 Linux 3.12-rc4 2013-10-09 12:36:13 +02:00
avr32 Linux 3.12-rc4 2013-10-09 12:36:13 +02:00
blackfin
c6x
cris
frv
h8300
hexagon
ia64
m32r
m68k
metag
microblaze
mips Merge branch 'linus' into sched/core 2013-11-01 08:24:41 +01:00
mn10300
openrisc Linux 3.12-rc4 2013-10-09 12:36:13 +02:00
parisc Merge branch 'linus' into sched/core 2013-11-01 08:24:41 +01:00
powerpc Merge branch 'linus' into sched/core 2013-11-01 08:24:41 +01:00
s390 Merge branch 'linus' into sched/core 2013-11-01 08:24:41 +01:00
score Linux 3.12-rc4 2013-10-09 12:36:13 +02:00
sh
sparc Merge branch 'linus' into sched/core 2013-11-01 08:24:41 +01:00
tile Merge branch 'core/urgent' into sched/core 2013-10-11 07:39:37 +02:00
um Merge branch 'linus' into sched/core 2013-11-01 08:24:41 +01:00
unicore32
x86 Merge branch 'linus' into sched/core 2013-11-01 08:24:41 +01:00
xtensa Merge branch 'linus' into sched/core 2013-11-01 08:24:41 +01:00
.gitignore
Kconfig