Merge branch 'timers/urgent' into timers/core
authorThomas Gleixner <tglx@linutronix.de>
Sat, 27 Jan 2018 14:35:29 +0000 (15:35 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Sat, 27 Jan 2018 14:35:29 +0000 (15:35 +0100)
Pick up urgent bug fix and resolve the conflict.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

No differences found