OSDN Git Service

(root) / uclinux-h8 / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b1a31a5 d5421ea)
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)
commit303c146df1c4574db3495d9acc5c440dd46c6b0f
treefbcea289aea24da8a44c7677a776988bb3c8bcbetree | snapshot
parentb1a31a5f5f27ff8aba42b545a1c721941f735107commit | diff
parentd5421ea43d30701e03cadc56a38854c36a8b4433commit | diff
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 diff1 | diff2 | blob | history
About OSDN
Find Software
Develop Software
Help