From: Ingo Molnar <mingo@kernel.org>
Date: Wed, 9 Oct 2013 10:36:13 +0000 (+0200)
Subject: Merge tag 'v3.12-rc4' into sched/core
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=37bf06375c90a42fe07b9bebdb07bc316ae5a0ce;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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>
---

37bf06375c90a42fe07b9bebdb07bc316ae5a0ce
diff --cc MAINTAINERS
index efdfcb2de523,8a0cbf3cf2c8..aee6733391cb
--- a/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 b946080ee8bb,fd7980743890..658001b52400
--- a/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