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

..

boards

avr32: boards/atngw100/mrmt.c: fix building error

2013-08-08 14:16:22 +02:00

boot

Kbuild: centralize MKIMAGE and cmd_uimage definitions

2012-03-26 15:49:20 +02:00

configs

Merge tag 'mmc-updates-for-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc

2013-05-04 13:45:17 -07:00

include

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

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

kernel

avr32: cast syscall_return to silence compiler warning

2013-09-30 08:42:01 +02:00

lib

ARCH: drivers remove __dev* attributes.

2013-01-03 15:57:13 -08:00

mach-at32ap

mtd: atmel_nand: replace cpu_is_at32ap7000() with a nand platform data

2013-08-05 20:55:42 +01:00

mm

arch: mm: pass userspace fault flag to generic fault handler

2013-09-12 15:38:01 -07:00

oprofile

oprofilefs_create_...() do not need superblock argument

2013-09-03 22:52:48 -04:00

Kconfig

Remove GENERIC_HARDIRQ config option

2013-09-13 15:09:52 +02:00

Kconfig.debug

…

Makefile

kbuild: allow assignment to {A,C,LD}FLAGS_MODULE on the command line

2010-08-03 14:09:45 +02:00