From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Fri, 4 Dec 2009 17:33:54 +0000 (+0000)
Subject: Merge branch 'for-rmk' of git://git.fluff.org/bjdooks/linux into devel-stable
X-Git-Tag: v2.6.33-rc1~384^2~1^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=602fd7c36728a04e61a442c9755e7d454501266c;p=thirdparty%2Flinux.git

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

Conflicts:
	arch/arm/Kconfig
---

602fd7c36728a04e61a442c9755e7d454501266c
diff --cc arch/arm/Kconfig
index 62152ae34758d,51a454bb40f99..7d0818797c85c
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -758,8 -747,7 +758,9 @@@ source "arch/arm/mach-orion5x/Kconfig
  
  source "arch/arm/mach-kirkwood/Kconfig"
  
 +source "arch/arm/mach-dove/Kconfig"
 +
+ source "arch/arm/plat-samsung/Kconfig"
  source "arch/arm/plat-s3c24xx/Kconfig"
  source "arch/arm/plat-s3c64xx/Kconfig"
  source "arch/arm/plat-s3c/Kconfig"