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/netfilter/ipvs | |
parent | 1304a7343b30fc4f16045412efdbb4179a3d9255 (diff) | |
parent | 8376dad0c877bc691b2feadd3390a162aa3c3bd9 (diff) | |
download | op-kernel-dev-bba6ec7e4963e30366359686f34e5bdb00b1a066.zip op-kernel-dev-bba6ec7e4963e30366359686f34e5bdb00b1a066.tar.gz |
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 'net/netfilter/ipvs')
0 files changed, 0 insertions, 0 deletions