Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable

Conflicts:
	arch/arm/Makefile

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Makefile
index 215a5cdd3d7f4840c3eafef9978acdc9cbcaeada,056daf8b68a5c45af7a5172186cd22bcd39684dd..a99aafebdfb42a48de652ee31ce3e2196ee98124
--- 1/arch/arm/Makefile
--- 2/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -146,7 -146,7 +146,8 @@@ machine-$(CONFIG_ARCH_MX1)         := mx
  machine-$(CONFIG_ARCH_MX2)            := mx2
  machine-$(CONFIG_ARCH_MX25)           := mx25
  machine-$(CONFIG_ARCH_MX3)            := mx3
+ machine-$(CONFIG_ARCH_MX5)            := mx5
 +machine-$(CONFIG_ARCH_MXC91231)               := mxc91231
  machine-$(CONFIG_ARCH_NETX)           := netx
  machine-$(CONFIG_ARCH_NOMADIK)                := nomadik
  machine-$(CONFIG_ARCH_NS9XXX)         := ns9xxx

diff --cc arch/arm/plat-mxc/include/mach/uncompress.h
Simple merge

diff --cc drivers/serial/imx.c
Simple merge