From: Arnd Bergmann Date: Mon, 14 May 2012 19:15:20 +0000 (+0200) Subject: Merge branch 'next/cleanup-plat-s3c24xx-s5p' of git://git.kernel.org/pub/scm/linux... X-Git-Tag: firefly_0821_release~3680^2~2750^2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=424663566c43ce87e8b33228860bf882f1ea61bf;p=firefly-linux-kernel-4.4.55.git Merge branch 'next/cleanup-plat-s3c24xx-s5p' of git://git./linux/kernel/git/kgene/linux-samsung into next/cleanup2 Kukjin Kim writes: We can remove plat-s5p directory with this series and I think, the plat-s3c24xx can be removed next time for one plat-samsung of Samsung stuff. Note, this is including cleanup-samsung-iommu which is removing s5p iommu stuff in plat-s5p. * 'next/cleanup-plat-s3c24xx-s5p' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: SAMSUNG: merge plat-s5p into plat-samsung ARM: SAMSUNG: move options for common s5p into plat-samsung/Kconfig ARM: SAMSUNG: move setup code for s5p mfc and mipiphy into plat-samsung ARM: SAMSUNG: move platform device for s5p uart into plat-samsung ARM: SAMSUNG: move hr timer for common s5p into plat-samsung ARM: SAMSUNG: move pm part for common s5p into plat-samsung ARM: SAMSUNG: move interrupt part for common s5p into plat-samsung ARM: SAMSUNG: move clock part for common s5p into plat-samsung ARM: S3C24XX: Use common macro to define resources on dev-uart.c ARM: S3C24XX: move common clock init into common.c ARM: S3C24XX: move common power-management code to mach-s3c24xx ARM: S3C24XX: move plat-s3c24xx/dev-uart.c into common.c ARM: S3C24XX: move plat-s3c24xx/cpu.c Signed-off-by: Arnd Bergmann --- 424663566c43ce87e8b33228860bf882f1ea61bf