system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-29 16:00:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
linux/arch
History
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 sched, arch: Create asm/preempt.h 2013-09-25 14:07:50 +02:00
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 sched, arch: Create asm/preempt.h 2013-09-25 14:07:50 +02:00
c6x sched, arch: Create asm/preempt.h 2013-09-25 14:07:50 +02:00
cris sched, arch: Create asm/preempt.h 2013-09-25 14:07:50 +02:00
frv sched, arch: Create asm/preempt.h 2013-09-25 14:07:50 +02:00
h8300 sched, arch: Create asm/preempt.h 2013-09-25 14:07:50 +02:00
hexagon sched, arch: Create asm/preempt.h 2013-09-25 14:07:50 +02:00
ia64 sched, arch: Create asm/preempt.h 2013-09-25 14:07:50 +02:00
m32r sched, arch: Create asm/preempt.h 2013-09-25 14:07:50 +02:00
m68k sched, arch: Create asm/preempt.h 2013-09-25 14:07:50 +02:00
metag sched, arch: Create asm/preempt.h 2013-09-25 14:07:50 +02:00
microblaze sched, arch: Create asm/preempt.h 2013-09-25 14:07:50 +02:00
mips Merge branch 'linus' into sched/core 2013-11-01 08:24:41 +01:00
mn10300 sched, arch: Create asm/preempt.h 2013-09-25 14:07:50 +02:00
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 sched, arch: Create asm/preempt.h 2013-09-25 14:07:50 +02:00
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 sched, arch: Create asm/preempt.h 2013-09-25 14:07:50 +02:00
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 mutex: replace CONFIG_HAVE_ARCH_MUTEX_CPU_RELAX with simple ifdef 2013-09-28 12:46:21 +02:00