]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'timers/urgent' into timers/core
authorThomas Gleixner <tglx@linutronix.de>
Wed, 21 Jun 2017 07:07:52 +0000 (09:07 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Wed, 21 Jun 2017 07:07:52 +0000 (09:07 +0200)
Pick up dependent changes.

1  2 
drivers/clocksource/arm_arch_timer.c
drivers/clocksource/cadence_ttc_timer.c
drivers/clocksource/timer-sun5i.c

Simple merge
Simple merge