Merge tag 'dt-3.11-5' of git://git.infradead.org/users/jcooper/linux into next/dt

From Jason Cooper:
mvebu dt changes for v3.11 (round 5)
 - mvebu
    - set aliases for ethernet interfaces
    - PCIe range for armada-xp-db
    - rm unused properties on A370
 - kirkwood
    - assign sheevaplug pinmuxs to correct devices
    - enable second PCIe port for ts219

* tag 'dt-3.11-5' of git://git.infradead.org/users/jcooper/linux:
  ARM: Kirkwood: ts219: Enable second PCIe port in DT.
  ARM: mvebu: Remove device tree unused properties on A370
  arm: mvebu: armada-xp-db: ensure PCIe range is specified
  arm: kirkwood: sheevaplug: move pinmux configs to the right devices
  ARM: mvebu: set aliases for ethernet controllers

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

diff --cc arch/arm/boot/dts/armada-370-xp.dtsi
index 36feff3a363e3c5256056bf06af465b8975411d2,f7da39453d2f369f3c9a34872208e2bf639cfcae..a679b6697a981c69b962784a752a128166fb7769
--- 1/arch/arm/boot/dts/armada-370-xp.dtsi
--- 2/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@@ -22,13 -22,14 +22,18 @@@
        model = "Marvell Armada 370 and XP SoC";
        compatible = "marvell,armada-370-xp";
  
+       aliases {
+               eth0 = &eth0;
+               eth1 = &eth1;
+       };
+ 
        cpus {
 +              #address-cells = <1>;
 +              #size-cells = <0>;
                cpu@0 {
                        compatible = "marvell,sheeva-v7";
 +                      device_type = "cpu";
 +                      reg = <0>;
                };
        };
  

diff --cc arch/arm/boot/dts/armada-370.dtsi
Simple merge

diff --cc arch/arm/boot/dts/armada-xp.dtsi
Simple merge