Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net
authorDavid S. Miller <davem@davemloft.net>
Tue, 17 Jul 2012 06:18:47 +0000 (23:18 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 17 Jul 2012 06:19:26 +0000 (23:19 -0700)
commit5dcaba7ed5be7fcedde7732111f31692e2e39ef9
tree8fd80363f3c4cb7d00e69043599060d0f597b3ab
parent96f80d123eff05c3cd4701463786b87952a6c3ac
parenta52359b56c29f55aaadf1dab80a0e1043b982676
Merge branch 'master' of git://git./linux/kernel/git/jkirsher/net

Jeff Kirsher says:

====================
This series contains fixes to e1000e.
 ...
Bruce Allan (1):
  e1000e: fix test for PHY being accessible on 82577/8/9 and I217

Tushar Dave (1):
  e1000e: Correct link check logic for 82571 serdes
====================

Signed-off-by: David S. Miller <davem@davemloft.net>