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
..
Makefile
qlge_dbg.c	qlge: make local function static	2013-12-26 13:29:35 -05:00
qlge_ethtool.c	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
qlge_main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-01-18 00:55:41 -08:00
qlge_mpi.c	qlge: call ql_core_dump() only if dump memory was allocated.	2013-09-24 11:19:46 -04:00
qlge.h	qlge: make local function static	2013-12-26 13:29:35 -05:00