projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 87d9430 c4c112f)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net...
authorDavid S. Miller <davem@davemloft.net>
Sat, 6 Sep 2014 19:30:27 +0000 (12:30 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 6 Sep 2014 19:30:27 +0000 (12:30 -0700)
commit8b3bfffc410268ccae137a36f1aee6024a72332c
treeb7e0c60a77a807a687afbe54275392e6961b3fbctree | snapshot
parent87d943085b76c6f07807dbc9fde2aad88e828590commit | diff
parentc4c112f1585fde3926976da8962ba84d342d8869commit | diff
Merge branch 'master' of git://git./linux/kernel/git/jkirsher/net-next

Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates 2014-09-06

This series contains updates to e1000 and igb.

Krzysztof provides a patch to cleanup the coding style in e1000 to quiet
checkpatch.pl warnings.

Todd adds two boolean flags to igb to allow for changes in the
advertised EEE speeds from ethtool.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
John Crispins staging tree