From: Thomas Gleixner Date: Thu, 18 Jun 2015 22:17:47 +0000 (+0200) Subject: Merge branch 'timers/core' into sched/hrtimers X-Git-Tag: v4.2-rc1~131^2~13 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=624bbdfac99c50bf03dff9a0023f666b8e965627;p=thirdparty%2Fkernel%2Flinux.git 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. --- 624bbdfac99c50bf03dff9a0023f666b8e965627