diff options
| author | David S. Miller <davem@davemloft.net> | 2013-09-04 18:40:37 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-09-04 18:40:37 +0200 |
| commit | b163b42fd230ef81eae09a6fe493a33ce17b8f86 (patch) | |
| tree | 4eaca2d710d47f15ae033545bdf6d0748e79afe7 /net | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/... (diff) | |
| parent | igb: Update version number (diff) | |
| download | linux-b163b42fd230ef81eae09a6fe493a33ce17b8f86.tar.xz linux-b163b42fd230ef81eae09a6fe493a33ce17b8f86.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Jeff Kirsher says:
====================
This series contains updates to igb only.
Todd provides a fix for igb to not look for a PBA in the iNVM on
devices that are flashless.
Akeem provides igb patches to add a new PHY id for i354, as well as
a couple of patches to implement the new PHY id. He also provides
several patches to correctly report the appropriate media type as
well as correctly report advertised/supported link for i354 devices.
Lastly Akeem implements a 1 second delay mechanism for i210 devices
to avoid erroneous link issue with the link partner.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions