Merge tag 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6 into next/cleanup

From:  Sascha Hauer <s.hauer@pengutronix.de>

ARM: i.MX cleanups for 3.5

* tag 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6: (5 commits)
  ARM: mx53: fix pad definitions for MX53_PAD_EIM_D28__I2C1_SDA and MX53_PAD_GPIO_8__CAN1_RXCAN
  ARM: imx/eukrea_mbimx27-baseboard: fix typo in error message
  ARM: i.MX51 iomux: add missed definitions for SION-bit and mode for some pads
  arm: imx: add missing select IMX_HAVE_PLATFORM for MACH_MX35_3DS in Kconfig
  arm: imx: make various struct sys_timer static

Includes an update to 3.4-rc4

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-at91/at91rm9200_devices.c
index d9f0d770978efb887a30948ac5575095a2528900,05774e5b1cbaf32488a142b4060a1adc452c8177..99affb5d0563432a9b2da1c2861abdc099d64f00
--- 1/arch/arm/mach-at91/at91rm9200_devices.c
--- 2/arch/arm/mach-at91/at91rm9200_devices.c
+++ b/arch/arm/mach-at91/at91rm9200_devices.c
@@@ -1160,10 -1168,13 +1160,9 @@@ void __init at91_add_device_serial(void
                if (at91_uarts[i])
                        platform_device_register(at91_uarts[i]);
        }
 -
 -      if (!atmel_default_console_device)
 -              printk(KERN_INFO "AT91: No default serial console defined.\n");
  }
  #else
- void __init __deprecated at91_init_serial(struct at91_uart_config *config) {}
  void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins) {}
 -void __init at91_set_serial_console(unsigned portnr) {}
  void __init at91_add_device_serial(void) {}
  #endif
  

diff --cc arch/arm/mach-at91/board-rm9200ek.c
Simple merge

diff --cc arch/arm/mach-at91/board-sam9261ek.c
Simple merge