David S. Miller 0ddead90b2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The conflicts were two cases of overlapping changes in batman-adv and the qed driver. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-06-15 11:59:32 -04:00
..
e1000
e1000e	e1000e: Undo e1000e_pm_freeze if __e1000_shutdown fails	2017-06-07 20:45:58 -07:00
fm10k	net: propagate tc filter chain index down the ndo_setup_tc call	2017-06-08 09:55:53 -04:00
i40e	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-15 11:59:32 -04:00
i40evf	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-06 22:20:08 -04:00
igb	igb: make a few local functions static	2017-06-07 19:05:42 -07:00
igbvf	igbvf: Use net_device_stats from struct net_device	2017-04-20 16:32:45 -07:00
ixgb	ixgb: Omit private ndo_get_stats function	2017-04-20 16:18:45 -07:00
ixgbe	ixgbe: pci_set_drvdata must be called before register_netdev	2017-06-13 17:36:39 -07:00
ixgbevf	ixgbevf: Bump version number	2017-06-13 16:11:48 -07:00
e100.c	net/{mii, smsc}: Make mii_ethtool_get_link_ksettings and smc_netdev_get_ecmd return void	2017-06-05 11:00:42 -04:00
Kconfig	i40evf: Add support for Adaptive Virtual Function	2017-06-01 14:30:02 -07:00
Makefile