From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 18 Jun 2015 22:17:47 +0000 (+0200)
Subject: Merge branch 'timers/core' into sched/hrtimers
X-Git-Tag: omap-for-v4.2/fixes-rc1^2~135^2~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=624bbdfac99c50bf03dff9a0023f666b8e965627;p=pandora-kernel.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
Reading git-diff-tree failed