ARM: Merge for-2635/samsung-rtc
authorBen Dooks <ben-linux@fluff.org>
Wed, 19 May 2010 09:07:25 +0000 (18:07 +0900)
committerBen Dooks <ben-linux@fluff.org>
Wed, 19 May 2010 09:07:25 +0000 (18:07 +0900)
commit14b8a0f92b309ff452a8c339abd9a096d00b210f
tree0472637882c576873aae00207a07f9d178cdebd7
parent05a690d2db5bd57d3c94293b06b69158535835df
parentadc0950c08e1f433f6933759f4facf9b2cf8d29d
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
arch/arm/mach-s3c64xx/Makefile
arch/arm/mach-s3c64xx/include/mach/map.h
arch/arm/plat-samsung/Kconfig
arch/arm/plat-samsung/Makefile