]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'timers/urgent' into WIP.timers
authorThomas Gleixner <tglx@linutronix.de>
Sun, 4 Jun 2017 13:21:52 +0000 (15:21 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Sun, 4 Jun 2017 13:21:52 +0000 (15:21 +0200)
commita2ae979dcc1412d0ab6f1bf60c5521e3e0f3070f
tree1a744c8230cd5a72adc363ca93458a748c664abe
parenta4e461812419cfe53f182ddedc33d5359bf00048
parente2074a858a14417eb20e08d07e3a822a986acdbd
Merge branch 'timers/urgent' into WIP.timers

Pick up urgent fixes to avoid conflicts.
kernel/time/alarmtimer.c
kernel/time/posix-cpu-timers.c