]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit6e9e709bb4c134deae6da0dace1dd239d4f6708c
treefbcea289aea24da8a44c7677a776988bb3c8bcbe
parente681de2784fc778e7308cd6aae4de0b13e6bce1c
parent325ecd6a0fbf46880b2a999e7703af4e0c0e3d5a
Merge branch 'timers/urgent' into timers/core

Pick up urgent bug fix and resolve the conflict.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
kernel/time/hrtimer.c