linux/drivers/net/ethernet/qlogic/qlcnic
David S. Miller b3e0d3d7ba Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/geneve.c

Here we had an overlapping change, where in 'net' the extraneous stats
bump was being removed whilst in 'net-next' the final argument to
udp_tunnel6_xmit_skb() was being changed.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-12-17 22:08:28 -05:00
..
Makefile net: ethernet: qlogic: qlcnic: Remove duplicate object file from Makefile 2014-08-11 12:44:35 -07:00
qlcnic_83xx_hw.c qlcnic: constify qlcnic_mbx_ops structure 2015-10-13 04:18:44 -07: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 timeout loop 2015-12-15 13:11:05 -05:00
qlcnic_ctx.c net: qlcnic: delete redundant memsets 2015-09-09 17:06:01 -07:00
qlcnic_dcb.c Update setapp/getapp prototypes in dcbnl_rtnl_ops to return int instead of u8 2014-07-17 16:02:29 -07:00
qlcnic_dcb.h
qlcnic_ethtool.c qlcnic: Fix ordering of stats in stats buffer. 2014-09-26 15:11:31 -04: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: Use usleep_range() instead of msleep() for sleep less than 20ms 2014-08-29 20:15:36 -07:00
qlcnic_io.c net: add netif_tx_napi_add() 2015-11-18 16:17:41 -05:00
qlcnic_main.c net/qlcnic: fix mac address restore in bond mode 5/6 2015-11-07 13:17:31 -05:00
qlcnic_minidump.c qlcnic: Print firmware minidump buffer and template header addresses 2015-08-10 13:34:28 -07: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: constify qlcnic_mbx_ops structure 2015-10-13 04:18:44 -07:00