Forum | Documentation | Website | Blog

Skip to content
Snippets Groups Projects
Commit 93057a75 authored by Dan Murphy's avatar Dan Murphy
Browse files

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...
parents 04dd103f 04b8944e
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment