Merge branch 'connectivity-ti-linux-3.14.y' of git://git.ti.com/connectivity-integrat...
authorDan Murphy <DMurphy@ti.com>
Mon, 1 Dec 2014 09:33:10 +0000 (03:33 -0600)
committerDan Murphy <DMurphy@ti.com>
Mon, 1 Dec 2014 09:33:10 +0000 (03:33 -0600)
commit9036ac6daed64032ef1207817019672a335b58b2
tree1cd802b6c084ea47cf3fd98725744428f6113ecd
parent9f9246f7f1beeedf262a2850725d29343e7fd157
parent2add4cd6794906bbdc8ac8e8008d5246321f9619
Merge branch 'connectivity-ti-linux-3.14.y' of git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel into ti-linux-3.14.y

TI-Feature: connectivity
TI-Tree: git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel.git
TI-Branch: connectivity-ti-linux-3.14.y

* 'connectivity-ti-linux-3.14.y' of git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel:
  ARM: dts: DRA7X: drop id property in pcie_phy
  phy: phy-ti-pipe3: fix inconsistent enumeration of PCIe gen2 cards

Signed-off-by: Dan Murphy <DMurphy@ti.com>
arch/arm/boot/dts/dra7.dtsi