| commit | 8b3bfffc410268ccae137a36f1aee6024a72332c | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Sat Sep 06 12:30:27 2014 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Sat Sep 06 12:30:27 2014 -0700 |
| tree | b7e0c60a77a807a687afbe54275392e6961b3fbc | |
| parent | 87d943085b76c6f07807dbc9fde2aad88e828590 [diff] | |
| parent | c4c112f1585fde3926976da8962ba84d342d8869 [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/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>