diff options
| author | David S. Miller <davem@davemloft.net> | 2017-03-22 10:31:27 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-03-22 10:31:27 -0700 |
| commit | 7ada7ca562714632d0fc9abb24e27cab67bdbf0d (patch) | |
| tree | 06ecc2062e03c0c34b942d7c64f8b06309d1114e /net/atm/resources.c | |
| parent | 592d42ac7fd36408979e09bf2f170f2595dab7b8 (diff) | |
| parent | f22913d0b5560ae621e8a7391e9547d5a6fd8893 (diff) | |
Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue
Jeff Kirsher says:
====================
Intel Wired LAN Driver Updates 2017-03-21
This series contains updates to e1000, e1000e, igb, igbvf and ixgb.
This finishes up the work Philippe Reynes did to update the Intel drivers
to the new API for ethtool (get|set)_link_ksettings.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/atm/resources.c')
0 files changed, 0 insertions, 0 deletions