leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28be6e07e8
linux/drivers/net/ethernet/qlogic/qlcnic
History
David S. Miller 53af53ae83 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	include/linux/netdevice.h
	net/core/sock.c

Trivial merge issues.

Removal of "extern" for functions declaration in netdevice.h
at the same time "const" was added to an argument.

Two parallel line additions in net/core/sock.c

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-10-08 23:07:53 -04:00
..
Makefile qlcnic: dcb: Query adapter DCB capabilities. 2013-08-27 15:21:13 -04:00
qlcnic_83xx_hw.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2013-09-06 09:36:28 -07:00
qlcnic_83xx_hw.h qlcnic: Add support for per port eswitch configuration 2013-08-31 22:34:44 -04:00
qlcnic_83xx_init.c qlcnic: Add support for per port eswitch configuration 2013-08-31 22:34:44 -04:00
qlcnic_83xx_vnic.c qlcnic: Add support for per port eswitch configuration 2013-08-31 22:34:44 -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: Fix sparse warning. 2013-09-04 00:27:27 -04:00
qlcnic_dcb.h qlcnic: dcb: Add support for CEE Netlink interface. 2013-08-27 15:21:14 -04:00
qlcnic_ethtool.c qlcnic: Fix register device in FAILED state for 82xx. 2013-09-27 17:26:20 -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 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2013-09-06 09:36:28 -07:00
qlcnic_main.c qlcnic: add missing destroy_workqueue() on error path in qlcnic_probe() 2013-10-08 16:33:50 -04:00
qlcnic_minidump.c qlcnic: Store firmware dump state in CAMRAM register 2013-08-31 22:34:43 -04:00
qlcnic_sriov_common.c qlcnic: Fix VF reset recovery 2013-09-15 22:10:57 -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: Fix warning reported by kbuild test robot. 2013-09-11 15:59:59 -04:00