Merge branch 'for-rmk/samsung3' of git://git.fluff.org/bjdooks/linux into devel-stable

Conflicts:
	arch/arm/Kconfig

diff --cc arch/arm/Kconfig
index 2d70cece2ea2f390856d84c8c4515310082e9e2a,550c038451a7d4013e28f8d8450708c82203ebf8..62065531b63994694b89ef881d95ad87cd57287d
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -876,9 -894,7 +880,9 @@@ source "arch/arm/mach-sa1100/Kconfig
  source "arch/arm/plat-samsung/Kconfig"
  source "arch/arm/plat-s3c24xx/Kconfig"
  source "arch/arm/plat-s5p/Kconfig"
- source "arch/arm/plat-s5pc1xx/Kconfig"
+ 
 +source "arch/arm/plat-spear/Kconfig"
 +
  if ARCH_S3C2410
  source "arch/arm/mach-s3c2400/Kconfig"
  source "arch/arm/mach-s3c2410/Kconfig"

diff --cc arch/arm/Makefile
index 4b857fbe4314d028c9a457ab69a2f3f1295e9fe7,f7cb6d49548482b0d360ab6d7aca352bb38a279e..64ba313724d2377fda7e439e130d7ad69dd1a83c
--- 1/arch/arm/Makefile
--- 2/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -198,10 -192,7 +198,9 @@@ plat-$(CONFIG_PLAT_NOMADIK)       := nomadi
  plat-$(CONFIG_PLAT_ORION)     := orion
  plat-$(CONFIG_PLAT_PXA)               := pxa
  plat-$(CONFIG_PLAT_S3C24XX)   := s3c24xx samsung
- plat-$(CONFIG_PLAT_S5PC1XX)   := s5pc1xx samsung
  plat-$(CONFIG_PLAT_S5P)               := s5p samsung
 +plat-$(CONFIG_PLAT_SPEAR)     := spear
 +plat-$(CONFIG_PLAT_VERSATILE) := versatile
  
  ifeq ($(CONFIG_ARCH_EBSA110),y)
  # This is what happens if you forget the IOCS16 line.