diff options
author | David S. Miller <davem@davemloft.net> | 2014-09-06 21:30:27 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-09-06 21:30:27 +0200 |
commit | 8b3bfffc410268ccae137a36f1aee6024a72332c (patch) | |
tree | b7e0c60a77a807a687afbe54275392e6961b3fbc /drivers/pcmcia | |
parent | tcp: remove obsolete comment about TCP_SKB_CB(skb)->when in tcp_fragment() (diff) | |
parent | igb: add flags to set eee advertisement mode (diff) | |
download | linux-8b3bfffc410268ccae137a36f1aee6024a72332c.tar.xz linux-8b3bfffc410268ccae137a36f1aee6024a72332c.zip |
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>
Diffstat (limited to 'drivers/pcmcia')
0 files changed, 0 insertions, 0 deletions