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
..
netxen	netxen: Use pci_enable_msix_range() instead of pci_enable_msix()	2014-02-18 15:33:33 -05:00
qlcnic	qlcnic: Remove casts of pointer to same type	2014-03-26 15:46:16 -04:00
qlge	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-29 18:48:54 -04: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