Merge branch 'sched/core' into core/locking, to prepare the kernel/locking/ file...
authorIngo Molnar <mingo@kernel.org>
Wed, 6 Nov 2013 06:50:37 +0000 (07:50 +0100)
committerIngo Molnar <mingo@kernel.org>
Wed, 6 Nov 2013 06:50:37 +0000 (07:50 +0100)
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>
1  2 
MAINTAINERS
include/linux/sched/sysctl.h
include/trace/events/sched.h
kernel/Makefile
kernel/rcu/tree.c
kernel/sysctl.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
diff --cc 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
  
Simple merge
diff --cc kernel/sysctl.c
Simple merge