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>

diff --cc MAINTAINERS
index efdfcb2,8a0cbf3..aee6733
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -7256,13 -7282,11 +7282,13 @@@ S:   Maintaine
  F:    kernel/sched/
  F:    include/linux/sched.h
  F:    include/uapi/linux/sched.h
 +F:    kernel/wait.c
 +F:    include/linux/wait.h
  
  SCORE ARCHITECTURE
- M:    Chen Liqin <liqin.chen@sunplusct.com>
+ M:    Chen Liqin <liqin.linux@gmail.com>
  M:    Lennox Wu <lennox.wu@gmail.com>
- W:    http://www.sunplusct.com
+ W:    http://www.sunplus.com
  S:    Supported
  F:    arch/score/
  

diff --cc arch/avr32/include/asm/Kbuild
index b946080,fd79807..658001b
--- 1/arch/avr32/include/asm/Kbuild
--- 2/arch/avr32/include/asm/Kbuild
+++ b/arch/avr32/include/asm/Kbuild
@@@ -1,6 -1,19 +1,20 @@@
  
  generic-y     += clkdev.h
+ generic-y       += cputime.h
+ generic-y       += delay.h
+ generic-y       += device.h
+ generic-y       += div64.h
+ generic-y       += emergency-restart.h
  generic-y     += exec.h
- generic-y     += trace_clock.h
+ generic-y       += futex.h
++generic-y     += preempt.h
+ generic-y       += irq_regs.h
  generic-y     += param.h
- generic-y += preempt.h
+ generic-y       += local.h
+ generic-y       += local64.h
+ generic-y       += percpu.h
+ generic-y       += scatterlist.h
+ generic-y       += sections.h
+ generic-y       += topology.h
+ generic-y     += trace_clock.h
+ generic-y       += xor.h

diff --cc arch/x86/kernel/entry_64.S
Simple merge

diff --cc kernel/context_tracking.c
Simple merge

diff --cc kernel/softirq.c
Simple merge