David S. Miller 71a83a6db6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/rocker/rocker.c The rocker commit was two overlapping changes, one to rename the ->vport member to ->pport, and another making the bitmask expression use '1ULL' instead of plain '1'. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-03-03 21:16:48 -05:00
..
e1000	net: e1000: support txtd update delay via xmit_more	2015-01-22 18:10:23 -08:00
e1000e	e1000e: initial support for i219	2015-02-23 17:11:53 -08:00
fm10k	fm10k: Resolve various spelling errors and checkpatch warnings	2015-03-03 01:07:23 -08:00
i40e	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-03 21:16:48 -05:00
i40evf	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-03 21:16:48 -05:00
igb	igb: Indicate failure on vf reset for empty mac address	2015-01-22 18:10:23 -08:00
igbvf	igbvf: cleanup msleep() and min/max() usage	2015-02-23 17:11:54 -08:00
ixgb	net: rename vlan_tx_* helpers since "tx" is misleading there	2015-01-13 17:51:08 -05:00
ixgbe	ethernet: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:36 -05:00
ixgbevf	ixgbevf: combine all of the tasks into a single service task	2015-02-05 19:58:45 -08:00
e100.c	e100: fix typo in MDI/MDI-X eeprom check in e100_phy_init	2014-12-31 11:55:40 -08:00
Kconfig	i40e: Fix dependencies in the i40e driver on configfs	2015-03-03 16:52:41 -05:00
Makefile	fm10k: Add skeletal frame for Intel(R) FM10000 Ethernet Switch Host Interface Driver	2014-09-23 03:59:13 -07:00