David S. Miller 64c27237a0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/marvell/mvneta.c The mvneta.c conflict is a case of overlapping changes, a conversion to devm_ioremap_resource() vs. a conversion to netdev_alloc_pcpu_stats. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-03-29 18:48:54 -04:00
..
Makefile
qlge.h	qlge: make local function static	2013-12-26 13:29:35 -05:00
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-03-29 18:48:54 -04:00
qlge_mpi.c	qlge: call ql_core_dump() only if dump memory was allocated.	2013-09-24 11:19:46 -04:00