Merge branch 'linus' into timers/core

Make sure the upstream fixes are applied before adding further modifications.
2015-05-19 16:12:32 +02:00
parent daa67b4b70 e26081808e
commit c3b5d3cea5
3182 changed files with 109019 additions and 66067 deletions
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
@@ -252,4 +252,10 @@ extern void clocksource_of_init(void);
 static inline void clocksource_of_init(void) {}
 #endif

+#ifdef CONFIG_ACPI
+void acpi_generic_timer_init(void);
+#else
+static inline void acpi_generic_timer_init(void) { }
+#endif
+
 #endif /* _LINUX_CLOCKSOURCE_H */