]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit7d0de48e88d867fb75602b81310dbac0f522729f
tree431d1345087021736a2ae66b041d2a9593ebf1d3
parent0233799b7f5c5c59be22a479815fa3436ebfbe1a
parent673eac342b9f2abe3d68d841e982d0e482e14405
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.
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