]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
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)
Conflicts:
arch/arm/mach-s3c24xx/include/mach/system.h

1  2 
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/mach-s3c24xx/s3c2412.c
arch/arm/mach-s3c24xx/s3c2416.c
drivers/leds/Kconfig
drivers/rtc/Kconfig

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge