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-30 13:37:29 +01:00
2018-01-20 11:41:09 -08:00
2017-11-20 21:50:24 -10:00
2017-12-22 12:30:10 -08:00