diff options
author | David S. Miller <davem@davemloft.net> | 2018-08-07 15:48:38 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-08-07 15:48:38 -0700 |
commit | 4df9085b012d40db92a9e08e9ed891ddeed78af1 (patch) | |
tree | 03b931f157cb5050a00aa788fb1217040ae93a5c /tools/testing/selftests/tc-testing/tc-tests/actions/nat.json | |
parent | Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue (diff) | |
parent | net: phy: Add support for Broadcom Omega internal Combo GPHY (diff) | |
download | linux-dev-4df9085b012d40db92a9e08e9ed891ddeed78af1.tar.xz linux-dev-4df9085b012d40db92a9e08e9ed891ddeed78af1.zip |
Merge branch 'brcm-omega'
Arun Parameswaran says:
====================
Add Broadcom Omega SoC internal switch and phy
The patchset is based on David Miller's "net-next" repo.
The patches add support for the Broadcom Omega SoC's internal ethernet
switch and the internal gphy.
The internal ethernet switch in the Omega is a b53 srab based switch.
The support for the switch is added to the b53 driver in the dsa
framework.
The gphy support is added to the bcm7xxx driver.
====================
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions