Merge branch 'fortglx/3.11/time' of git://git.linaro.org/people/jstultz/linux into timers/core · 67c120dc33 - Gogs

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

Thomas Gleixner 12 years ago

parent

064706514e 629a6a2b77

commit

67c120dc33

1 changed files with 4 additions and 0 deletions

Split View Show Diff Stats

						
							+ 4
							
							- 0
						
arch/arm/include/asm/sched_clock.h
							 
								View File
							
				@@ -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>