tree 0472637882c576873aae00207a07f9d178cdebd7
parent 05a690d2db5bd57d3c94293b06b69158535835df
parent adc0950c08e1f433f6933759f4facf9b2cf8d29d
author Ben Dooks <ben-linux@fluff.org> 1274260045 +0900
committer Ben Dooks <ben-linux@fluff.org> 1274260045 +0900

ARM: Merge for-2635/samsung-rtc

Merge branch 'for-2635/samsung-rtc' into for-linus/samsung2

Conflicts:
	arch/arm/mach-s3c64xx/include/mach/map.h
	arch/arm/plat-samsung/Kconfig
	arch/arm/plat-samsung/Makefile