OSDN Git Service

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)
commit978267b6430c07d62cb38f83e058a3132c52eca1
tree1a744c8230cd5a72adc363ca93458a748c664abe
parent6bc51cbaa9d75c7c240282da5ff270815caccac0
parentff86bf0c65f14346bf2440534f9ba5ac232c39a0
Merge branch 'timers/urgent' into WIP.timers

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