diff options
| author | David S. Miller <davem@davemloft.net> | 2014-02-14 00:28:30 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-02-14 00:28:30 -0500 |
| commit | a56cddd8dcbd1410074cce0d5c1354fcbe635755 (patch) | |
| tree | f93f6823c932572ef20c6688ff84e75a1f259424 /net/8021q | |
| parent | c045a734da4cb6d4665962f252de3d8871136ae9 (diff) | |
| parent | 32ec90d5d5bb7569374801bcb3fed77f688ed8f7 (diff) | |
| download | linux-a56cddd8dcbd1410074cce0d5c1354fcbe635755.tar.bz2 | |
Merge branch 'bcmgenet'
Florian Fainelli says:
====================
Support for the Broadcom GENET driver
This patchset adds support for the Broadcom GENET Gigabit Ethernet MAC
controller. This controller is found on the Broadcom BCM7xxx Set Top Box
System-on-a-chips.
Changes since v4:
- add dependency on CONFIG_OF
Changes since v3:
- fixed Kconfig dependency on FIXED_PHY
Changes since v2:
- dropped the patch that adds an "internal" phy-mode
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q')
0 files changed, 0 insertions, 0 deletions