| commit | 978267b6430c07d62cb38f83e058a3132c52eca1 | [log] [tgz] |
|---|---|---|
| author | Thomas Gleixner <tglx@linutronix.de> | Sun Jun 04 15:21:52 2017 +0200 |
| committer | Thomas Gleixner <tglx@linutronix.de> | Sun Jun 04 15:21:52 2017 +0200 |
| tree | 1a744c8230cd5a72adc363ca93458a748c664abe | |
| parent | 6bc51cbaa9d75c7c240282da5ff270815caccac0 [diff] | |
| parent | ff86bf0c65f14346bf2440534f9ba5ac232c39a0 [diff] |
Merge branch 'timers/urgent' into WIP.timers Pick up urgent fixes to avoid conflicts.