linux/drivers/net/ethernet/qlogic
David S. Miller c3fa32b976 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/usb/qmi_wwan.c
	include/net/dst.h

Trivial merge conflicts, both were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-10-23 16:49:34 -04:00
..
netxen net: netxen: remove unnecessary pci_set_drvdata() 2013-10-22 02:11:51 -04:00
qlcnic Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-10-23 16:49:34 -04:00
qlge net: qlge: remove unnecessary pci_set_drvdata() 2013-10-22 02:11:51 -04: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