Merge branch 'timers/urgent' into timers/core

Pick up dependent changes.
2017-06-21 09:07:52 +02:00
parent 098b0e01a9 8e6cec1c7c
commit f0cd9ae5d0
787 changed files with 7199 additions and 4640 deletions
--- a/drivers/clocksource/timer-sun5i.c
+++ b/drivers/clocksource/timer-sun5i.c
@@ -12,6 +12,7 @@

 #include <linux/clk.h>
 #include <linux/clockchips.h>
+#include <linux/clocksource.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>