Ingo Molnar 37bf06375c Merge tag 'v3.12-rc4' into sched/core ...

Merge Linux v3.12-rc4 to fix a conflict and also to refresh the tree
before applying more scheduler patches.

Conflicts:
	arch/avr32/include/asm/Kbuild

Signed-off-by: Ingo Molnar <mingo@kernel.org>

2013-10-09 12:36:13 +02:00

..

alpha

sched, arch: Create asm/preempt.h

2013-09-25 14:07:50 +02:00

arc

Merge tag 'v3.12-rc4' into sched/core

2013-10-09 12:36:13 +02:00

arm

Merge tag 'v3.12-rc4' into sched/core

2013-10-09 12:36:13 +02:00

arm64

Merge tag 'v3.12-rc4' into sched/core

2013-10-09 12:36:13 +02:00

avr32

Merge tag 'v3.12-rc4' into sched/core

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 tag 'v3.12-rc4' into sched/core

2013-10-09 12:36:13 +02:00

mn10300

sched, arch: Create asm/preempt.h

2013-09-25 14:07:50 +02:00

openrisc

Merge tag 'v3.12-rc4' into sched/core

2013-10-09 12:36:13 +02:00

parisc

Merge tag 'v3.12-rc4' into sched/core

2013-10-09 12:36:13 +02:00

powerpc

Merge tag 'v3.12-rc4' into sched/core

2013-10-09 12:36:13 +02:00

s390

Merge tag 'v3.12-rc4' into sched/core

2013-10-09 12:36:13 +02:00

score

Merge tag 'v3.12-rc4' into sched/core

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 tag 'v3.12-rc4' into sched/core

2013-10-09 12:36:13 +02:00

tile

sched, arch: Create asm/preempt.h

2013-09-25 14:07:50 +02:00

um

sched, arch: Create asm/preempt.h

2013-09-25 14:07:50 +02:00

unicore32

sched, arch: Create asm/preempt.h

2013-09-25 14:07:50 +02:00

x86

Merge tag 'v3.12-rc4' into sched/core

2013-10-09 12:36:13 +02:00

xtensa

sched, arch: Create asm/preempt.h

2013-09-25 14:07:50 +02:00

.gitignore

…

Kconfig

mutex: replace CONFIG_HAVE_ARCH_MUTEX_CPU_RELAX with simple ifdef

2013-09-28 12:46:21 +02:00