Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Russell King [Tue, 2 Mar 2010 23:29:32 +0000 (23:29 +0000)]
Conflicts:
arch/arm/Makefile

1  2 
MAINTAINERS
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/plat-mxc/include/mach/uncompress.h
drivers/serial/imx.c

diff --cc MAINTAINERS
Simple merge
Simple merge
@@@ -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
Simple merge