diff options
author | David S. Miller <davem@davemloft.net> | 2012-08-22 14:23:43 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-08-22 14:23:43 -0700 |
commit | bba6ec7e4963e30366359686f34e5bdb00b1a066 (patch) | |
tree | 05c44b6b99e46d876b144065537dd8673d07b162 /net/ipv4/fib_frontend.c | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
parent | igb: update to allow reading/setting MDI state (diff) | |
download | linux-dev-bba6ec7e4963e30366359686f34e5bdb00b1a066.tar.xz linux-dev-bba6ec7e4963e30366359686f34e5bdb00b1a066.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Jeff Kirsher says:
====================
This series contains updates to ethtool.h, e1000, e1000e, and igb to
implement MDI/MDIx control.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions