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

drivers/net/ethernet/intel/e100.c

drivers/net/ethernet/intel/e1000e/80003es2lan.c

drivers/net/ethernet/intel/e1000e/82571.c

drivers/net/ethernet/intel/e1000e/ethtool.c

drivers/net/ethernet/intel/e1000e/ich8lan.c

drivers/net/ethernet/intel/e1000e/mac.c

drivers/net/ethernet/intel/e1000e/manage.c

drivers/net/ethernet/intel/e1000e/param.c

drivers/net/ethernet/intel/e1000e/phy.c

drivers/net/ethernet/intel/igb/igb_main.c

drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c

drivers/net/ethernet/intel/ixgbe/ixgbe_type.h