Merge remote-tracking branch 'at91/at91-next'

Conflicts:
	arch/arm/mach-at91/at91cap9.c
	arch/arm/mach-at91/at91sam9260.c
	arch/arm/mach-at91/at91sam9261.c
	arch/arm/mach-at91/at91sam9263.c
	arch/arm/mach-at91/at91sam9_alt_reset.S
	arch/arm/mach-at91/at91sam9g45.c
	arch/arm/mach-at91/at91sam9rl.c
	arch/arm/mach-at91/board-cap9adk.c
	arch/arm/mach-at91/board-cpu9krea.c
	arch/arm/mach-at91/board-cpuat91.c
	arch/arm/mach-at91/board-snapper9260.c
	arch/arm/mach-at91/generic.h
	arch/arm/mach-at91/include/mach/system.h
	arch/arm/mach-at91/setup.c
	include/linux/platform_data/macb.h

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

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

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

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

diff --cc arch/arm/mach-at91/setup.c
index cf98a8f94dc5afd19ee1c1471b79483eaa273dcb,63902fb44b23974d1573921030f24dc8d48f568b..8a1b692a757cd3f55a380dacd54093ce21eedaaa
--- 1/arch/arm/mach-at91/setup.c
--- 2/arch/arm/mach-at91/setup.c
+++ b/arch/arm/mach-at91/setup.c
@@@ -73,9 -75,24 +75,6 @@@ static struct map_desc at91_io_desc __i
        .type           = MT_DEVICE,
  };
  
- #define AT91_DBGU0    0xfffff200
- #define AT91_DBGU1    0xffffee00
 -void __iomem *at91_ioremap(unsigned long p, size_t size, unsigned int type)
 -{
 -      if (p >= AT91_BASE_SYS && p <= (AT91_BASE_SYS + SZ_16K - 1))
 -              return (void __iomem *)AT91_IO_P2V(p);
 -
 -      return __arm_ioremap_caller(p, size, type, __builtin_return_address(0));
 -}
 -EXPORT_SYMBOL(at91_ioremap);
 -
 -void at91_iounmap(volatile void __iomem *addr)
 -{
 -      unsigned long virt = (unsigned long)addr;
 -
 -      if (virt >= VMALLOC_START && virt < VMALLOC_END)
 -              __iounmap(addr);
 -}
 -EXPORT_SYMBOL(at91_iounmap);
--
  static void __init soc_detect(u32 dbgu_base)
  {
        u32 cidr, socid;