linux/drivers/net/ethernet/qlogic/qlcnic
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
..
Makefile qlcnic: dcb: Query adapter DCB capabilities. 2013-08-27 15:21:13 -04:00
qlcnic_83xx_hw.c qlcnic: dcb code cleanup and refactoring. 2013-10-18 13:42:19 -04:00
qlcnic_83xx_hw.h qlcnic: Remove redundant eSwitch enable commands 2013-10-18 13:42:19 -04:00
qlcnic_83xx_init.c qlcnic: dcb code cleanup and refactoring. 2013-10-18 13:42:19 -04:00
qlcnic_83xx_vnic.c qlcnic: Remove redundant eSwitch enable commands 2013-10-18 13:42:19 -04:00
qlcnic_ctx.c drivers:net: Convert dma_alloc_coherent(...__GFP_ZERO) to dma_zalloc_coherent 2013-08-29 21:55:23 -04:00
qlcnic_dcb.c qlcnic: dcb code cleanup and refactoring. 2013-10-18 13:42:19 -04:00
qlcnic_dcb.h qlcnic: dcb code cleanup and refactoring. 2013-10-18 13:42:19 -04:00
qlcnic_ethtool.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-10-23 16:49:34 -04:00
qlcnic_hdr.h qlcnic: Secondary unicast MAC address support. 2013-06-23 18:29:58 -07:00
qlcnic_hw.c net:drivers/net: Miscellaneous conversions to ETH_ALEN 2013-10-02 17:04:45 -04:00
qlcnic_hw.h qlcnic: dcb: Register DCB AEN handler. 2013-08-27 15:21:14 -04:00
qlcnic_init.c qlcnic: Enable diagnostic test for multiple Tx queues. 2013-08-21 12:17:18 -07:00
qlcnic_io.c qlcnic: dcb code cleanup and refactoring. 2013-10-18 13:42:19 -04:00
qlcnic_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-10-23 16:49:34 -04:00
qlcnic_minidump.c qlcnic: Skip unknown entry type while collecting firmware dump 2013-10-18 13:42:19 -04:00
qlcnic_sriov_common.c qlcnic: dcb code cleanup and refactoring. 2013-10-18 13:42:19 -04:00
qlcnic_sriov_pf.c qlcnic: Fix SR-IOV configuration 2013-10-01 12:34:59 -04:00
qlcnic_sriov.h qlcnic: Add support for 83xx suspend and resume. 2013-06-23 18:29:59 -07:00
qlcnic_sysfs.c qlcnic: Fix register device in FAILED state for 82xx. 2013-09-27 17:26:20 -04:00
qlcnic.h qlcnic: update version to 5.3.51 2013-10-18 13:42:20 -04:00