author | Dan Murphy <DMurphy@ti.com> | |
Thu, 11 Dec 2014 09:33:14 +0000 (03:33 -0600) | ||
committer | Dan Murphy <DMurphy@ti.com> | |
Thu, 11 Dec 2014 09:33:14 +0000 (03:33 -0600) | ||
commit | bd5cf93c18e1ada7074a36e73c84e4e857a1f674 | |
tree | b2fb995ac247852a9f6d8ff0a96cf567f4931d7d | tree | snapshot (tar.xz tar.gz zip) |
parent | ce5e8a493ab799aaf5ccd09e2d6457eaa596a702 | commit | diff |
parent | 2a6188e6c0a7d6889b07b19ff35c506d956308a0 | 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:
drivers: net: cpsw: add broadcast/multicast rate limit support via switch config ioctl
drivers; net: cpsw: add port vlan support via switch config ioctl
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:
drivers: net: cpsw: add broadcast/multicast rate limit support via switch config ioctl
drivers; net: cpsw: add port vlan support via switch config ioctl
Signed-off-by: Dan Murphy <DMurphy@ti.com>