David S. Miller 4180442058 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c net/ipv4/tcp_metrics.c Overlapping changes between the "don't create two tcp metrics objects with the same key" race fix in net and the addition of the destination address in the lookup key in net-next. Minor overlapping changes in bnx2x driver. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-01-18 00:55:41 -08:00
..
e1000	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
e1000e	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-01-18 00:55:41 -08:00
i40e	i40e: Fix device ID define names to align to standard	2014-01-17 19:13:04 -08:00
i40evf	i40e: Fix device ID define names to align to standard	2014-01-17 19:13:04 -08:00
igb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-12-18 16:42:06 -05:00
igbvf	net: igbvf: slight optimization of addr compare	2013-12-31 16:48:31 -05:00
ixgb	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
ixgbe	ixgbe: bump version number	2014-01-17 18:56:59 -08:00
ixgbevf	ixgbevf: merge ixgbevf_tx_map and ixgbevf_tx_queue into a single function	2014-01-17 19:15:10 -08:00
e100.c	net: e100: remove unnecessary pci_set_drvdata()	2013-10-21 17:21:01 -04:00
Kconfig	i40e: add DCB option to Kconfig	2014-01-17 19:13:04 -08:00
Makefile	i40evf: add driver to kernel build system	2013-12-31 16:27:49 -08:00