Merge branch 'stmp' into devel

diff --cc arch/arm/Kconfig
index 3473f8b8ede689a53a565a34eefb6178d1fa3157,d17c801a1704018ccb17fa7b0601f01ac80c5dae..fee7c64ca7235d601ca2e7afb67f755b7c7ce17a
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -673,8 -692,12 +686,10 @@@ source "arch/arm/mach-s3c6400/Kconfig
  source "arch/arm/mach-s3c6410/Kconfig"
  endif
  
+ source "arch/arm/plat-stmp3xxx/Kconfig"
+ 
  source "arch/arm/mach-lh7a40x/Kconfig"
  
 -source "arch/arm/mach-imx/Kconfig"
 -
  source "arch/arm/mach-h720x/Kconfig"
  
  source "arch/arm/mach-versatile/Kconfig"

diff --cc arch/arm/Makefile
Simple merge