diff options
| author | David S. Miller <davem@davemloft.net> | 2013-09-04 12:40:37 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-09-04 12:40:37 -0400 |
| commit | b163b42fd230ef81eae09a6fe493a33ce17b8f86 (patch) | |
| tree | 4eaca2d710d47f15ae033545bdf6d0748e79afe7 /sound/sparc | |
| parent | 48f8e0af8668351e249f817406c770a36e2274db (diff) | |
| parent | 66f40b8a294c5266c2bfc1f1ed2eb8b2bb00d5e8 (diff) | |
| download | op-kernel-dev-b163b42fd230ef81eae09a6fe493a33ce17b8f86.zip op-kernel-dev-b163b42fd230ef81eae09a6fe493a33ce17b8f86.tar.gz | |
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 'sound/sparc')
0 files changed, 0 insertions, 0 deletions
