linux/drivers/net/ethernet/qlogic/qlcnic
David S. Miller 739e4a758e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/usb/r8152.c
	net/netfilter/nfnetlink.c

Both r8152 and nfnetlink conflicts were simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-10-02 11:25:43 -07: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: Use usleep_range() instead of msleep() for sleep less than 20ms 2014-08-29 20:15:36 -07:00
qlcnic_83xx_hw.h qlcnic: Add support to run firmware POST 2014-08-29 20:15:37 -07:00
qlcnic_83xx_init.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-10-02 11:25:43 -07:00
qlcnic_83xx_vnic.c
qlcnic_ctx.c qlcnic: Set driver version before registering netdev 2014-08-05 16:23:26 -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: Use usleep_range() instead of msleep() for sleep less than 20ms 2014-08-29 20:15:36 -07:00
qlcnic_hw.h qlcnic: Add VXLAN Rx offload support 2014-03-24 00:44:23 -04: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 qlcnic: Set skb->csum_level for encapsulated checksum 2014-08-29 20:41:12 -07:00
qlcnic_main.c qlcnic: Add support to run firmware POST 2014-08-29 20:15:37 -07:00
qlcnic_minidump.c qlcnic: Fix endianess issue in FW dump template header 2014-08-21 17:43:15 -07:00
qlcnic_sriov_common.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-06-05 16:22:02 -07:00
qlcnic_sriov_pf.c net-next:v4: Add support to configure SR-IOV VF minimum and maximum Tx rate through ip tool. 2014-05-23 15:04:02 -04:00
qlcnic_sriov.h net-next:v4: Add support to configure SR-IOV VF minimum and maximum Tx rate through ip tool. 2014-05-23 15:04:02 -04:00
qlcnic_sysfs.c qlcnic: Fix flash access interface to application 2014-08-21 17:43:15 -07:00
qlcnic.h qlcnic: Update version to 5.3.62 2014-08-29 20:15:37 -07:00