Merge branch 'topic/cleanup-s3c24xx' into next/cleanup-s3c24xx
authorKukjin Kim <kgene.kim@samsung.com>
Fri, 2 Mar 2012 23:57:03 +0000 (08:57 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Wed, 7 Mar 2012 09:36:33 +0000 (01:36 -0800)
commit880bcd4a8363f24375027f9ded4670960dcfa70a
tree31894d9dc2c29f31234e479de520a50858cce54c
parenta5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13
parent8c3d7c30c306d83ff9c303f42307765a5a7bc254
Merge branch 'topic/cleanup-s3c24xx' into next/cleanup-s3c24xx

Conflicts:
arch/arm/mach-s3c24xx/include/mach/system.h
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/mach-s3c24xx/s3c2412.c
arch/arm/mach-s3c24xx/s3c2416.c
drivers/leds/Kconfig
drivers/rtc/Kconfig