From: Arnd Bergmann Date: Mon, 29 Feb 2016 22:57:21 +0000 (+0100) Subject: Merge tag 'mvebu-dt-4.6-2' of git://git.infradead.org/linux-mvebu into next/dt X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=eff01adba1deb13b0e79926f7eab7cc02fb8da6e;p=linux-beck.git Merge tag 'mvebu-dt-4.6-2' of git://git.infradead.org/linux-mvebu into next/dt Merge "mvebu dt for 4.6 (part 2)" from Gregory CLEMENT: - Reorder Ethernet node on Armada 38x SoCs - Add device tree for buffalo linkstation ls-gl - Use the more accurate armada-370-sata string for SATA on Armada 375 - Add NAND description to Armada 370 DB and Armada XP DB * tag 'mvebu-dt-4.6-2' of git://git.infradead.org/linux-mvebu: ARM: dts: mvebu: add NAND description to Armada 370 DB and Armada XP DB ARM: dts: armada-375: use armada-370-sata for SATA ARM: dts: orion5x: add device tree for buffalo linkstation ls-gl ARM: dts: orion5x: split linkstation lswtgl into common and device parts ARM: dts: armada-38x: add reference to ETH connectors for A385-AP ARM: dts: armada-38x: change order of ethernet DT nodes on Armada 38x ARM: dts: orion5x: fix the missing mtd flash on linkstation lswtgl ARM: dts: kirkwood: use unique machine name for ds112 --- eff01adba1deb13b0e79926f7eab7cc02fb8da6e