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
..
netxen	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-01-06 17:37:45 -05:00
qlcnic	qlcnic: remove unused code	2014-01-17 18:04:19 -08:00
qlge	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-01-18 00:55:41 -08:00
Kconfig	qlcnic: dcb: Query adapter DCB capabilities.	2013-08-27 15:21:13 -04:00
Makefile
qla3xxx.c	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
qla3xxx.h