Merge commit 'v2.6.38-rc4' into imx-for-2.6.39
authorSascha Hauer <s.hauer@pengutronix.de>
Fri, 11 Feb 2011 07:32:18 +0000 (08:32 +0100)
committerSascha Hauer <s.hauer@pengutronix.de>
Fri, 11 Feb 2011 07:33:14 +0000 (08:33 +0100)
commitf19693a17c6705e197eb24d4618060eaac1b535c
treefc39dc23297c0e6be730cb0dfd74a34d9c0b8bfd
parent23b120cdfae4f5c29da69de750d545bad719ead4
parent100b33c8bd8a3235fd0b7948338d6cbb3db3c63d
Merge commit 'v2.6.38-rc4' into imx-for-2.6.39

Conflicts:
arch/arm/mach-mxs/clock-mx28.c

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
arch/arm/mach-imx/mach-mx25_3ds.c
arch/arm/mach-mxs/clock-mx28.c
arch/arm/mach-mxs/gpio.c
arch/arm/plat-mxc/include/mach/uncompress.h
drivers/tty/serial/Kconfig
drivers/tty/serial/Makefile
drivers/tty/serial/mxs-auart.c