David S. Miller 143c905494 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/intel/i40e/i40e_main.c drivers/net/macvtap.c Both minor merge hassles, simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-12-18 16:42:06 -05:00
..
netxen	ethernet: Fix FSF address in file headers	2013-12-06 12:37:55 -05:00
qlcnic	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-12-18 16:42:06 -05:00
qlge	qlge: Update version to 1.00.00.34	2013-12-05 20:33:47 -05:00
Kconfig	qlcnic: dcb: Query adapter DCB capabilities.	2013-08-27 15:21:13 -04:00
Makefile
qla3xxx.c	net: qla3xxx: remove unnecessary pci_set_drvdata()	2013-10-22 02:11:52 -04:00
qla3xxx.h