leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
a8df35d458
linux/drivers/net/ethernet/qlogic/qlcnic
History
David S. Miller 909b27f706 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
The nf_conntrack_core.c fix in 'net' is not relevant in 'net-next'
because we no longer have a per-netns conntrack hash.

The ip_gre.c conflict as well as the iwlwifi ones were cases of
overlapping changes.

Conflicts:
	drivers/net/wireless/intel/iwlwifi/mvm/tx.c
	net/ipv4/ip_gre.c
	net/netfilter/nf_conntrack_core.c

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-05-15 13:32:48 -04:00
..
Makefile
qlcnic_83xx_hw.c qlcnic: Fix mailbox completion handling during spurious interrupt 2016-03-10 16:15:54 -05:00
qlcnic_83xx_hw.h qlcnic: Add support to enable capability to extend minidump for iSCSI 2015-08-10 13:34:28 -07:00
qlcnic_83xx_init.c qlcnic: Don't use kzalloc unncecessarily for allocating large chunk of memory 2015-08-10 13:34:28 -07:00
qlcnic_83xx_vnic.c qlcnic: fix a loop exit condition better 2015-12-24 11:02:35 -05:00
qlcnic_ctx.c qlcnic: correctly handle qlcnic_alloc_mbx_args 2016-01-04 17:14:30 -05:00
qlcnic_dcb.c qlcnic: constify qlcnic_dcb_ops structures 2015-12-28 00:44:52 -05:00
qlcnic_dcb.h qlcnic: constify qlcnic_dcb_ops structures 2015-12-28 00:44:52 -05:00
qlcnic_ethtool.c qlcnic: Fix mailbox completion handling during spurious interrupt 2016-03-10 16:15:54 -05:00
qlcnic_hdr.h
qlcnic_hw.c qlcnic: Rearrange ordering of header files inclusion 2015-08-10 13:34:28 -07:00
qlcnic_hw.h qlcnic: Add support to enable capability to extend minidump for iSCSI 2015-08-10 13:34:28 -07:00
qlcnic_init.c
qlcnic_io.c net: add netif_tx_napi_add() 2015-11-18 16:17:41 -05:00
qlcnic_main.c qlcnic: protect qlicnic_attach_func with rtnl_lock 2016-04-21 15:35:44 -04:00
qlcnic_minidump.c qlcnic: potential NULL dereference in qlcnic_83xx_get_minidump_template() 2016-05-11 23:44:56 -04:00
qlcnic_sriov_common.c net: qlcnic: delete redundant memsets 2015-09-09 17:06:01 -07:00
qlcnic_sriov_pf.c qlcnic: Rearrange ordering of header files inclusion 2015-08-10 13:34:28 -07:00
qlcnic_sriov.h qlcnic: Rearrange ordering of header files inclusion 2015-08-10 13:34:28 -07:00
qlcnic_sysfs.c qlcnic: Rearrange ordering of header files inclusion 2015-08-10 13:34:28 -07:00
qlcnic.h qlcnic: Update version to 5.3.64 2016-04-24 14:45:04 -04:00