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>

diff --cc arch/arm/mach-imx/mach-mx25_3ds.c
Simple merge

diff --cc arch/arm/mach-mxs/clock-mx28.c
index c9d7951e8bfb39c44f33092dc2e1bc5d9a8bd374,fd1c4c54b8e510d76ddbb0b157fc1a9cb5655ac8..febd787f054f7661c2ead686e6bc80733a3e81a8
--- 1/arch/arm/mach-mxs/clock-mx28.c
--- 2/arch/arm/mach-mxs/clock-mx28.c
+++ b/arch/arm/mach-mxs/clock-mx28.c
@@@ -609,12 -609,6 +609,11 @@@ static struct clk_lookup lookups[] = 
        _REGISTER_CLOCK("duart", NULL, uart_clk)
        _REGISTER_CLOCK("imx28-fec.0", NULL, fec_clk)
        _REGISTER_CLOCK("imx28-fec.1", NULL, fec_clk)
-       _REGISTER_CLOCK("fec.0", NULL, fec_clk)
 +      _REGISTER_CLOCK("mxs-auart.0", NULL, uart_clk)
 +      _REGISTER_CLOCK("mxs-auart.1", NULL, uart_clk)
 +      _REGISTER_CLOCK("mxs-auart.2", NULL, uart_clk)
 +      _REGISTER_CLOCK("mxs-auart.3", NULL, uart_clk)
 +      _REGISTER_CLOCK("mxs-auart.4", NULL, uart_clk)
        _REGISTER_CLOCK("rtc", NULL, rtc_clk)
        _REGISTER_CLOCK("pll2", NULL, pll2_clk)
        _REGISTER_CLOCK(NULL, "hclk", hbus_clk)

diff --cc arch/arm/mach-mxs/gpio.c
Simple merge

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

diff --cc drivers/tty/serial/Kconfig
Simple merge

diff --cc drivers/tty/serial/Makefile
Simple merge

diff --cc drivers/tty/serial/mxs-auart.c
index 6d01ac9681032201c41f435176a4357d938a1c65,0000000000000000000000000000000000000000..6d01ac9681032201c41f435176a4357d938a1c65
mode 100644,000000..100644
--- 1/drivers/serial/mxs-auart.c
--- /dev/null
+++ b/drivers/tty/serial/mxs-auart.c