From: David S. Miller Date: Wed, 4 Sep 2013 16:40:37 +0000 (-0400) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net... X-Git-Tag: next-20130912~156^2~33 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b163b42fd230ef81eae09a6fe493a33ce17b8f86;p=karo-tx-linux.git 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 --- b163b42fd230ef81eae09a6fe493a33ce17b8f86