Thomas Gleixner 303c146df1 Merge branch 'timers/urgent' into timers/core
Pick up urgent bug fix and resolve the conflict.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2018-01-27 15:35:29 +01:00
..
2017-11-18 11:32:27 +09:00
2017-12-15 12:56:23 -08:00
2017-11-18 10:26:57 -08:00