Merge tag 'boards-3.12-2' of git://git.infradead.org/linux-mvebu into next/boards

From Jason Cooper, mvebu boards changes for v3.12:

 - kirkwood
    - convert Dockstar, Guruplug, mv88f6281gtw_ge to DT
    - remove legacy boards (which have DT support) sheevaplug, lacie boards
    - ARRAY_AND_SIZE() cleanup

 - dove
    - some DT node updates (depends on irqchip/clocksource DT changes earlier)
    - add the D2Plug board

* tag 'boards-3.12-2' of git://git.infradead.org/linux-mvebu:
  ARM: dove: add initial DT file for Globalscale D2Plug
  ARM: dove: add GPIO IR receiver node to SolidRun CuBox
  ARM: dove: add common pinmux functions to DT
  ARM: dove: add cpu device tree node
  arch/arm/mach-kirkwood: Avoid using ARRAY_AND_SIZE(e) as a function argument
  ARM: kirkwood: fix DT building and update defconfig
  ARM: kirkwood: Remove all remaining trace of DNS-320/325 platform code
  ARM: kirkwood: use dts pre-processor for mv88f6281gtw-ge
  ARM: kirkwood: convert the mv88f6281gtw_ge board to DT
  ARM: kirkwood: remove LaCie boards that are supported through DT
  ARM: kirkwood: remove support for legacy booting of Sheevaplug
  ARM: kirkwood: remove support for legacy booting of Guruplug
  ARM: kirkwood: remove support for legacy booting of Dockstar

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm/boot/dts/Makefile
Simple merge