From Jason Cooper:
mvebu dt changes for v3.13 (round 2)

 - kirkwood
    - use MBus DT binding for setting up the windows
    - move crypto and nand underneath the mbus node
    - ib62x0 has a u-boot env partition

 - mvebu
    - add the Armada XP matrix board

* tag 'dt-3.13-2' of git://git.infradead.org/linux-mvebu:
  arm: mvebu: add support for the Armada XP Matrix board
  ARM: kirkwood: ib62x0: add u-boot environment partition
  ARM: kirkwood: Move the nand node under the mbus node
  ARM: kirkwood: Move the crypto node under the mbus node
  ARM: kirkwood: Remove kirkwood_setup_wins and rely on the DT binding
Signed-off-by: Kevin Hilman <khilman@linaro.org>