| commit | 624bbdfac99c50bf03dff9a0023f666b8e965627 | [log] [tgz] |
|---|---|---|
| author | Thomas Gleixner <tglx@linutronix.de> | Fri Jun 19 00:17:47 2015 +0200 |
| committer | Thomas Gleixner <tglx@linutronix.de> | Fri Jun 19 00:17:47 2015 +0200 |
| tree | 431d1345087021736a2ae66b041d2a9593ebf1d3 | |
| parent | 6f9aad0bc37286c0441b57f0ba8cffee50715426 [diff] | |
| parent | 887d9dc989eb0154492e41e7c07492edbb088ba1 [diff] |
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.