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.


Trivial merge