From: Ingo Molnar <mingo@kernel.org>
Date: Wed, 6 Nov 2013 06:50:37 +0000 (+0100)
Subject: Merge branch 'sched/core' into core/locking, to prepare the kernel/locking/ file... 
X-Git-Tag: v3.13-rc1~91^2~16
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c90423d1de12fbeaf0c898e1db0e962de347302b;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'sched/core' into core/locking, to prepare the kernel/locking/ file move

Conflicts:
	kernel/Makefile

There are conflicts in kernel/Makefile due to file moving in the
scheduler tree - resolve them.

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

c90423d1de12fbeaf0c898e1db0e962de347302b
diff --cc kernel/Makefile
index f99d908b5550,b3d51e229356..a4d1aa8da9bc
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@@ -6,9 -6,9 +6,9 @@@ obj-y     = fork.o exec_domain.o panic.
  	    cpu.o exit.o itimer.o time.o softirq.o resource.o \
  	    sysctl.o sysctl_binary.o capability.o ptrace.o timer.o user.o \
  	    signal.o sys.o kmod.o workqueue.o pid.o task_work.o \
 -	    rcupdate.o extable.o params.o posix-timers.o \
 +	    extable.o params.o posix-timers.o \
- 	    kthread.o wait.o sys_ni.o posix-cpu-timers.o mutex.o \
+ 	    kthread.o sys_ni.o posix-cpu-timers.o mutex.o \
 -	    hrtimer.o rwsem.o nsproxy.o srcu.o semaphore.o \
 +	    hrtimer.o rwsem.o nsproxy.o semaphore.o \
  	    notifier.o ksysfs.o cred.o reboot.o \
  	    async.o range.o groups.o lglock.o smpboot.o