Merge branch 'ux500-u9540-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel...

From: Linus Walleij <linus.walleij@linaro.org>:
  Core support for the U9540 after finalized review

* 'ux500-u9540-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson: (2 commits)
  ARM: ux500: ioremap differences for DB9540
  ARM: ux500: core U9540 support

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

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

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

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