From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 2 Mar 2010 23:31:07 +0000 (+0000)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=64ed28a87a0c075e91c1c5b0fe7d225a6cc6ae39;p=linux-edison.git

Merge /linux/kernel/git/lethal/genesis-2.6 into devel-stable

Conflicts:
	arch/arm/Kconfig
---

64ed28a87a0c075e91c1c5b0fe7d225a6cc6ae39
diff --cc arch/arm/Kconfig
index 7ac8386c700,55764a1c876..ee74c3a0388
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -830,8 -827,8 +835,10 @@@ source "arch/arm/mach-s3c6400/Kconfig
  source "arch/arm/mach-s3c6410/Kconfig"
  endif
  
 +source "arch/arm/mach-s5p6440/Kconfig"
 +
+ source "arch/arm/mach-shmobile/Kconfig"
+ 
  source "arch/arm/plat-stmp3xxx/Kconfig"
  
  if ARCH_S5PC1XX