projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6bc51cb ff86bf0)
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)
Pick up urgent fixes to avoid conflicts.

1  2 
kernel/time/alarmtimer.c patch | diff1 | diff2 | blob | history
kernel/time/posix-cpu-timers.c patch | diff1 | diff2 | blob | history

diff --cc kernel/time/alarmtimer.c
Simple merge
diff --cc kernel/time/posix-cpu-timers.c
Simple merge
Domain: System / Kernel;