You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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>		11 years ago
..
Makefile	…
qlge.h	qlge: make local function static	11 years ago
qlge_dbg.c	qlge: make local function static	11 years ago
qlge_ethtool.c	drivers/net: delete non-required instances of include <linux/init.h>	11 years ago
qlge_main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	11 years ago
qlge_mpi.c	…