From: Olof Johansson <olof@lixom.net>
Date: Fri, 14 Jun 2013 22:06:19 +0000 (-0700)
Subject: Merge tag 'dt-3.11-5' of git://git.infradead.org/users/jcooper/linux into next/dt
X-Git-Tag: omap-for-v3.11/fixes-for-merge-window~69^2~18
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9214cbe50fe74542f803dcc8d81f5e99c72918bf;p=pandora-kernel.git

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>
---

9214cbe50fe74542f803dcc8d81f5e99c72918bf
Reading git-diff-tree failed