tree 0248fb8f7a3e445cc3c744252abeecabb9205c05
parent b6825d2df55aa7d7341c715b577b73a6a03dc944
parent d5120ae72a066b18f98e0c45ce73262f58030851
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1224019491 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1224019491 +0100

Merge branch 's3c-move' into devel

Conflicts:

	arch/arm/mach-versatile/core.c