Merge branch 'timers/core' into sched/hrtimers
authorThomas Gleixner <tglx@linutronix.de>
Thu, 18 Jun 2015 22:17:47 +0000 (00:17 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 18 Jun 2015 22:17:47 +0000 (00:17 +0200)
Merge sched/core and timers/core so we can apply the sched balancing
patch queue, which depends on both.

1  2 
fs/dcache.c
kernel/futex.c
kernel/sched/core.c
kernel/sched/deadline.c
kernel/sched/fair.c
kernel/sched/rt.c
kernel/sched/sched.h
kernel/time/hrtimer.c
net/sched/sch_api.c

diff --cc fs/dcache.c
Simple merge
diff --cc kernel/futex.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge