From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 15 Feb 2010 21:20:18 +0000 (+0000)
Subject: Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=56012808f4d5606e401539f663d92009d964425b;p=deliverable%2Flinux.git

Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable

Conflicts:
	arch/arm/Makefile
---

56012808f4d5606e401539f663d92009d964425b
diff --cc arch/arm/Makefile
index bbcd512ccf7e,356d702c0808..215a5cdd3d7f
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -185,8 -185,6 +186,7 @@@ plat-$(CONFIG_PLAT_PXA)		:= px
  plat-$(CONFIG_PLAT_S3C24XX)	:= s3c24xx s3c samsung
  plat-$(CONFIG_PLAT_S3C64XX)	:= s3c64xx s3c samsung
  plat-$(CONFIG_PLAT_S5PC1XX)	:= s5pc1xx s3c samsung
 +plat-$(CONFIG_PLAT_S5P)		:= s5p samsung s3c
- plat-$(CONFIG_ARCH_STMP3XXX)	:= stmp3xxx
  
  ifeq ($(CONFIG_ARCH_EBSA110),y)
  # This is what happens if you forget the IOCS16 line.