Merge tag 'v3.12-rc4' into sched/core
authorIngo Molnar <mingo@kernel.org>
Wed, 9 Oct 2013 10:36:13 +0000 (12:36 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 9 Oct 2013 10:36:13 +0000 (12:36 +0200)
commit37bf06375c90a42fe07b9bebdb07bc316ae5a0ce
treede572dd6d3955b0725001776a7b03796f99e1e8e
parent6bfa687c19b7ab8adee03f0d43c197c2945dd869
parentd0e639c9e06d44e713170031fe05fb60ebe680af
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>
MAINTAINERS
arch/avr32/include/asm/Kbuild
arch/x86/kernel/entry_64.S
kernel/context_tracking.c
kernel/softirq.c