Russell King 58daf18cdc Merge branch 'clksrc' into devel ... Conflicts: arch/arm/mach-vexpress/v2m.c arch/arm/plat-omap/counter_32k.c arch/arm/plat-versatile/Makefile		2011-01-05 18:09:03 +00:00
..
clock.h
sched_clock.h	ARM: versatile: convert sched_clock() to use new infrastructure	2010-12-22 22:44:50 +00:00