Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net...

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>

diff --cc drivers/net/ethernet/intel/igb/igb_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/intel/igb/igb_main.c
Simple merge