FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-16 14:02:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
232,707 Commits 2 Branches 693 Tags 3.5 GiB
2c34e939f9
Commit Graph

2 Commits

Author SHA1 Message Date
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
Rob Herring
8a9618f5df ARM: 6432/1: move timer-sp.c from versatile to common 
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>
 2010-11-04 15:49:32 +00:00