Merge branch 'connectivity-ti-linux-3.14.y' of...
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-of...
Showing
- arch/arm/mach-omap2/omap_hwmod_7xx_data.c 14 additions, 0 deletionsarch/arm/mach-omap2/omap_hwmod_7xx_data.c
- arch/arm/mach-omap2/pdata-quirks.c 11 additions, 0 deletionsarch/arm/mach-omap2/pdata-quirks.c
- arch/arm/mach-omap2/prm7xx.h 2 additions, 0 deletionsarch/arm/mach-omap2/prm7xx.h
- drivers/net/ethernet/ti/cpsw.c 185 additions, 17 deletionsdrivers/net/ethernet/ti/cpsw.c
- drivers/net/ethernet/ti/cpsw_ale.c 10 additions, 2 deletionsdrivers/net/ethernet/ti/cpsw_ale.c
- drivers/net/ethernet/ti/cpsw_ale.h 4 additions, 0 deletionsdrivers/net/ethernet/ti/cpsw_ale.h
- drivers/pci/host/pci-dra7xx.c 32 additions, 0 deletionsdrivers/pci/host/pci-dra7xx.c
- include/linux/platform_data/pci-dra7xx.h 22 additions, 0 deletionsinclude/linux/platform_data/pci-dra7xx.h
- include/uapi/linux/Kbuild 1 addition, 0 deletionsinclude/uapi/linux/Kbuild
- include/uapi/linux/ethtool.h 4 additions, 0 deletionsinclude/uapi/linux/ethtool.h
- include/uapi/linux/net_switch_config.h 45 additions, 0 deletionsinclude/uapi/linux/net_switch_config.h
- include/uapi/linux/sockios.h 3 additions, 0 deletionsinclude/uapi/linux/sockios.h
- net/core/dev_ioctl.c 10 additions, 0 deletionsnet/core/dev_ioctl.c
Please register or sign in to comment