Merge branch 'fortglx/3.11/time' of git://git.linaro.org/people/jstultz/linux into timers/core

67c120dc · Thomas Gleixner · 06470651 · 629a6a2b · 67c120dc
Commit 67c120dc authored Jun 25, 2013 by Thomas Gleixner
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

arch/arm/include/asm/sched_clock.h arch/arm/include/asm/sched_clock.h +4 -0

No files found.
--- a/arch/arm/include/asm/sched_clock.h
+++ b/arch/arm/include/asm/sched_clock.h
+/* You shouldn't include this file. Use linux/sched_clock.h instead.
+ * Temporary file until all asm/sched_clock.h users are gone
+ */
+#include <linux/sched_clock.h>