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

arch/arm/include/asm/sched_clock.h

@@ -0,0 +1,4 @@
+/* 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>