]> 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)
commit20ee7a2b129bcc8c5ae967f63db7bf6ab5dd8767
treefbcea289aea24da8a44c7677a776988bb3c8bcbe
parente5f3f9c2742d96d55c5384466b0dba928b791538
parent91ff771c4ab8e34feec458d5c3e2bfc3a0766203
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