linux/drivers/net/ethernet/intel
David S. Miller f6d3125fa3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	net/dsa/slave.c

net/dsa/slave.c simply had overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-10-02 07:21:25 -07:00
..
e1000 e1000: remove dead e1000_init_eeprom_params calls 2015-09-22 15:58:28 -07:00
e1000e e1000e: Enable TSO for stacked VLAN 2015-09-22 15:58:28 -07:00
fm10k fm10k: add support for extra debug statistics 2015-09-22 15:58:27 -07:00
i40e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-10-02 07:21:25 -07:00
i40evf Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-10-02 07:21:25 -07:00
igb igb: assume MSI-X interrupts during initialization 2015-09-28 17:48:34 -07:00
igbvf igbvf: Enable TSO for stacked VLAN 2015-09-22 15:58:28 -07:00
ixgb ixgb: call netif_carrier_off early on down 2015-03-20 17:41:52 -07:00
ixgbe ixgbe: Advance version to 4.2.1 2015-09-23 23:09:34 -07:00
ixgbevf ixgbevf: Enables TSO for stacked VLAN 2015-09-22 15:58:29 -07:00
e100.c e100: Release skb when DMA mapping is failed in e100_xmit_prepare 2015-08-18 14:06:05 -07:00
Kconfig drivers/net: remove all references to obsolete Ethernet-HOWTO 2015-06-23 06:50:35 -07:00
Makefile