author | Dan Murphy <DMurphy@ti.com> | |
Tue, 12 Aug 2014 17:59:25 +0000 (12:59 -0500) | ||
committer | Dan Murphy <DMurphy@ti.com> | |
Tue, 12 Aug 2014 17:59:25 +0000 (12:59 -0500) | ||
commit | 93057a75217d392ea8a00db7fbd113fc3f8914f8 | |
tree | 108412fe9add8f0374b73666b437c25a6785447b | tree | snapshot (tar.xz tar.gz zip) |
parent | 04dd103fd8280cba2c0c458673275c62b3b142fd | commit | diff |
parent | 04b8944e274ca6f23bf4e40929c30a3c17d1c321 | commit | diff |
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:
pci: dra7xx: use pdata callbacks to perform reset
ARM: DRA7: add pdata-quirks to do reset of PCIe
drivers: net: cpsw: add support for switch ioctl
net: ioctl: Adding switch configuration via ioctl
drivers: net: cpsw: Add support for multicast/broadcast rate limit
net: ethtool: Add Multicast and broadcast rate limit coalescing feature
drivers: net: cpsw: disable coalesce when rx_coalesce_usecs is zero
drivers: net: cpsw: add support to dump ALE table via ethtool register dump
drivers: net: cpsw: cleanup: remove unused function
Conflicts:
arch/arm/mach-omap2/pdata-quirks.c
Signed-off-by: Dan Murphy <DMurphy@ti.com>
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:
pci: dra7xx: use pdata callbacks to perform reset
ARM: DRA7: add pdata-quirks to do reset of PCIe
drivers: net: cpsw: add support for switch ioctl
net: ioctl: Adding switch configuration via ioctl
drivers: net: cpsw: Add support for multicast/broadcast rate limit
net: ethtool: Add Multicast and broadcast rate limit coalescing feature
drivers: net: cpsw: disable coalesce when rx_coalesce_usecs is zero
drivers: net: cpsw: add support to dump ALE table via ethtool register dump
drivers: net: cpsw: cleanup: remove unused function
Conflicts:
arch/arm/mach-omap2/pdata-quirks.c
Signed-off-by: Dan Murphy <DMurphy@ti.com>
arch/arm/mach-omap2/omap_hwmod_7xx_data.c | diff1 | | diff2 | | blob | history |
arch/arm/mach-omap2/pdata-quirks.c | diff1 | | diff2 | | blob | history |