| commit | bba6ec7e4963e30366359686f34e5bdb00b1a066 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Wed Aug 22 14:23:43 2012 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Wed Aug 22 14:23:43 2012 -0700 |
| tree | 05c44b6b99e46d876b144065537dd8673d07b162 | |
| parent | 1304a7343b30fc4f16045412efdbb4179a3d9255 [diff] | |
| parent | 8376dad0c877bc691b2feadd3390a162aa3c3bd9 [diff] |
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>