author | Dan Murphy <dmurphy@ti.com> | |
Fri, 15 Mar 2013 12:17:42 +0000 (07:17 -0500) | ||
committer | Dan Murphy <dmurphy@ti.com> | |
Fri, 15 Mar 2013 12:17:42 +0000 (07:17 -0500) | ||
commit | 97935e38f983f32595edb78b5a4cc99727b36ac1 | |
tree | 0767419e55fbe4a86c8ce57981f5a6526e30cb9f | tree | snapshot (tar.xz tar.gz zip) |
parent | 16a9f7d71878c27594192992aa1b36666ceb292c | commit | diff |
parent | 446f6088f35b4e3e8e52dbf39efbd2dfb64f33b4 | commit | diff |
Merge branch 'connectivity-linux-3.8.y' into ti-linux-3.8.y
TI-Feature: connectivity_base
TI-Tree: git://gitorious.ti.com/ti-linux-kernel/connectivity-linux-feature-tree.git
TI-Branch: connectivity-linux-3.8.y
* connectivity-linux-3.8.y:
ARM: dts: AM33XX: Add CPSW phy_id device tree data to am335x-evmsk
net: ethernet: cpsw: fix usage of cpdma_check_free_tx_desc()
drivers: net: ethernet: cpsw: implement get phy_id via ioctl
driver: net: ethernet: cpsw: implement interrupt pacing via ethtool
driver: net: ethernet: cpsw: implement ethtool get/set phy setting
drivers: net: ethernet: cpsw: change cpts_active_slave to active_slave
documentation: dt: bindings: cpsw: cleanup documentation
drivers: net: ethernet: cpsw: consider number of slaves in interation
drivers: net: davinci_cpdma: acknowledge interrupt properly
net: cwdavinci_cpdma: export symbols for cpsw
net: ethernet: ti: remove redundant NULL check.
driver: net: ethernet: cpsw: dual emac interface implementation
driver: net: ethernet: cpsw: make cpts as pointer
driver: net: ethernet: davinci_cpdma: add support for directed packet and source port detection
drivers: net:ethernet: cpsw: add support for VLAN
drivers: net: cpsw: Add helper functions for VLAN ALE implementation
net: ethernet: davinci_cpdma: Add boundary for rx and tx descriptors
Conflicts:
arch/arm/boot/dts/am335x-evmsk.dts
Signed-off-by: Dan Murphy <dmurphy@ti.com>
TI-Feature: connectivity_base
TI-Tree: git://gitorious.ti.com/ti-linux-kernel/connectivity-linux-feature-tree.git
TI-Branch: connectivity-linux-3.8.y
* connectivity-linux-3.8.y:
ARM: dts: AM33XX: Add CPSW phy_id device tree data to am335x-evmsk
net: ethernet: cpsw: fix usage of cpdma_check_free_tx_desc()
drivers: net: ethernet: cpsw: implement get phy_id via ioctl
driver: net: ethernet: cpsw: implement interrupt pacing via ethtool
driver: net: ethernet: cpsw: implement ethtool get/set phy setting
drivers: net: ethernet: cpsw: change cpts_active_slave to active_slave
documentation: dt: bindings: cpsw: cleanup documentation
drivers: net: ethernet: cpsw: consider number of slaves in interation
drivers: net: davinci_cpdma: acknowledge interrupt properly
net: cwdavinci_cpdma: export symbols for cpsw
net: ethernet: ti: remove redundant NULL check.
driver: net: ethernet: cpsw: dual emac interface implementation
driver: net: ethernet: cpsw: make cpts as pointer
driver: net: ethernet: davinci_cpdma: add support for directed packet and source port detection
drivers: net:ethernet: cpsw: add support for VLAN
drivers: net: cpsw: Add helper functions for VLAN ALE implementation
net: ethernet: davinci_cpdma: Add boundary for rx and tx descriptors
Conflicts:
arch/arm/boot/dts/am335x-evmsk.dts
Signed-off-by: Dan Murphy <dmurphy@ti.com>
arch/arm/boot/dts/am335x-evmsk.dts | diff1 | | diff2 | | blob | history |
arch/arm/boot/dts/am33xx.dtsi | diff1 | | diff2 | | blob | history |