Merge branch 'fixes-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into...

diff --cc arch/arm/plat-mxc/include/mach/iomux-mx53.h
index e11dd5f09c34457606c19f209dd9674d54b885fa,2c4c60fe471a67001f5e2956a72c885d84860adc..9440b9e00e89c1536ce3d2e8d7ecbb55a5bbfd99
--- 1/arch/arm/plat-mxc/include/mach/iomux-mx53.h
--- 2/arch/arm/plat-mxc/include/mach/iomux-mx53.h
+++ b/arch/arm/plat-mxc/include/mach/iomux-mx53.h
@@@ -39,10 -39,10 +39,10 @@@
  #define _MX53_PAD_GPIO_19__ECSPI1_RDY IOMUX_PAD(0x348, 0x20, 5, 0x0, 0, 0)
  #define _MX53_PAD_GPIO_19__FEC_TDATA_3        IOMUX_PAD(0x348, 0x20, 6, 0x0, 0, 0)
  #define _MX53_PAD_GPIO_19__SRC_INT_BOOT       IOMUX_PAD(0x348, 0x20,7, 0x0, 0, 0)
 -#define _MX53_PAD_KEY_COL0__KPP_COL_0 IOMUX_PAD(0x34C, 0x24, o, 0x0, 0, 0)
 +#define _MX53_PAD_KEY_COL0__KPP_COL_0 IOMUX_PAD(0x34C, 0x24, 0, 0x0, 0, 0)
  #define _MX53_PAD_KEY_COL0__GPIO4_6           IOMUX_PAD(0x34C, 0x24, 1, 0x0, 0, 0)
  #define _MX53_PAD_KEY_COL0__AUDMUX_AUD5_TXC   IOMUX_PAD(0x34C, 0x24, 2, 0x758, 0, 0)
- #define _MX53_PAD_KEY_COL0__UART4_TXD_MUX     IOMUX_PAD(0x34C, 0x24, 4, 0x890, 0, 0)
+ #define _MX53_PAD_KEY_COL0__UART4_TXD_MUX     IOMUX_PAD(0x34C, 0x24, 4, 0x0, 0, 0)
  #define _MX53_PAD_KEY_COL0__ECSPI1_SCLK       IOMUX_PAD(0x34C, 0x24, 5, 0x79C, 0, 0)
  #define _MX53_PAD_KEY_COL0__FEC_RDATA_3       IOMUX_PAD(0x34C, 0x24, 6, 0x0, 0, 0)
  #define _MX53_PAD_KEY_COL0__SRC_ANY_PU_RST    IOMUX_PAD(0x34C, 0x24, 7, 0x0, 0, 0)

diff --cc sound/soc/imx/imx-pcm-dma-mx2.c
Simple merge