diff options
| author | David S. Miller <davem@davemloft.net> | 2015-06-10 22:14:14 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-06-10 22:14:14 -0700 |
| commit | 048856f4f27b08c6537566e6dbbb15a54298baa6 (patch) | |
| tree | 69880bcf5d295f2e2311128c3c026141e58a0726 /drivers/net/ethernet/cavium/Makefile | |
| parent | 6891ff43f054bc593cb2a6160d288b5c12cf384f (diff) | |
| parent | bec4e68e6a45cc502901743fcfacaa9c076dc6d5 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue
Jeff Kirsher says:
====================
Intel Wired LAN Driver Updates 2015-06-09
This series contains updates to ixgbe only.
The series adds additional support for x550 support, such as WoL and
auto-negotiation of flow control. Adds new PHY support (external PHY)
for x550, as well as the new methods/functions needed to support the new
PHY's. Fixed a bug found in code inspection, where a check was missed
when clearing counters for x550. Also fixed the init code flow for copper
x550 devices.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/cavium/Makefile')
0 files changed, 0 insertions, 0 deletions