author | Dan Murphy <dmurphy@ti.com> | |
Tue, 16 Jun 2015 13:49:33 +0000 (08:49 -0500) | ||
committer | Dan Murphy <dmurphy@ti.com> | |
Tue, 16 Jun 2015 13:49:33 +0000 (08:49 -0500) |
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: DRA7: GMAC: Apply Errata i877
ARM: OMAP2+: GMAC: Fix clock domain flags
ARM: OMAP2+: hwmod: Introduce ti,no-idle dt property
Signed-off-by: Dan Murphy <dmurphy@ti.com>
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: DRA7: GMAC: Apply Errata i877
ARM: OMAP2+: GMAC: Fix clock domain flags
ARM: OMAP2+: hwmod: Introduce ti,no-idle dt property
Signed-off-by: Dan Murphy <dmurphy@ti.com>
diff --cc arch/arm/boot/dts/am57xx-beagle-x15.dts
Simple merge
diff --cc arch/arm/boot/dts/dra7-evm.dts
Simple merge
diff --cc arch/arm/boot/dts/dra72-evm.dts
Simple merge
Simple merge
diff --cc arch/arm/mach-omap2/omap_hwmod.c
Simple merge