]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitc2de498783a2b7bc2e7696970968d8713047161c
tree0472637882c576873aae00207a07f9d178cdebd7
parent8c20e722d1b04f9587ff52ee1a040344fb516f0e
parent61833797148585d8b6b62e636308459d1cefa326
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