Merge branch 'timers/core' into sched/hrtimers

Merge sched/core and timers/core so we can apply the sched balancing
patch queue, which depends on both.

diff --cc fs/dcache.c
Simple merge

diff --cc kernel/futex.c
Simple merge

diff --cc kernel/sched/core.c
Simple merge

diff --cc kernel/sched/deadline.c
Simple merge

diff --cc kernel/sched/fair.c
Simple merge

diff --cc kernel/sched/rt.c
Simple merge

diff --cc kernel/sched/sched.h
Simple merge

diff --cc kernel/time/hrtimer.c
Simple merge

diff --cc net/sched/sch_api.c
Simple merge