Merge branch 'at91-3.4-base+device_board' of git://github.com/at91linux/linux-at91...

Merge branch 'at91-3.4-base+device_board' of git://github.com/at91linux/linux-at91 into next/drivers

* 'at91-3.4-base+device_board' of git://github.com/at91linux/linux-at91:
  ARM: at91: Add external RTC for Flexibity board
  ARM: at91: add Atmel ISI and ov2640 support on sam9m10g45 board
  ARM: at91: add clock selection parameter for at91_add_device_isi()
  ARM: at91: Update struct atmel_nand_data to support PMECC
  ARM: at91/dma: DMA controller registering with DT support
  ARM: at91/dma: remove platform data from DMA controller
  ARM: at91: code removal of CAP9 SoC

Conflicts:
	arch/arm/mach-at91/at91cap9.c