Age | Commit message (Collapse) | Author | |
---|---|---|---|
2011-01-05 | Merge branch 'clksrc' into devel | Russell King | |
Conflicts: arch/arm/mach-vexpress/v2m.c arch/arm/plat-omap/counter_32k.c arch/arm/plat-versatile/Makefile | |||
2010-11-04 | ARM: 6432/1: move timer-sp.c from versatile to common | Rob Herring | |
From: Rob Herring <rob.herring@smooth-stone.com> The timer-sp h/w used on versatile platforms can also be used for other platforms, so move it to a common location. Signed-off-by: Rob Herring <rob.herring@smooth-stone.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> |