Merge branch 'nomadik' into devel-stable

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Makefile
index 3de196e2a7a7f5ca1ee512d640461bb80159ac41,97cca075d0f9924f12207fc44606e6f85446b9c8..b70f62c8fc0a64671443e2d1d92734fd0f2d9797
--- 1/arch/arm/Makefile
--- 2/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -142,9 -135,9 +142,10 @@@ machine-$(CONFIG_ARCH_MSM)                := ms
  machine-$(CONFIG_ARCH_MV78XX0)                := mv78xx0
  machine-$(CONFIG_ARCH_MX1)            := mx1
  machine-$(CONFIG_ARCH_MX2)            := mx2
 +machine-$(CONFIG_ARCH_MX25)           := mx25
  machine-$(CONFIG_ARCH_MX3)            := mx3
  machine-$(CONFIG_ARCH_NETX)           := netx
+ machine-$(CONFIG_ARCH_NOMADIK)                := nomadik
  machine-$(CONFIG_ARCH_NS9XXX)         := ns9xxx
  machine-$(CONFIG_ARCH_OMAP1)          := omap1
  machine-$(CONFIG_ARCH_OMAP2)          := omap2