David S. Miller 4fbef95af4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/emulex/benet/be.h drivers/net/usb/qmi_wwan.c drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h include/net/netfilter/nf_conntrack_synproxy.h include/net/secure_seq.h The conflicts are of two varieties: 1) Conflicts with Joe Perches's 'extern' removal from header file function declarations. Usually it's an argument signature change or a function being added/removed. The resolutions are trivial. 2) Some overlapping changes in qmi_wwan.c and be.h, one commit adds a new value, another changes an existing value. That sort of thing. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-10-01 17:06:14 -04:00
..
netxen	netxen_nic: Update version to 4.0.82	2013-09-27 13:30:58 -04:00
qlcnic	qlcnic: Fix SR-IOV configuration	2013-10-01 12:34:59 -04:00
qlge	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-10-01 17:06:14 -04:00
Kconfig	qlcnic: dcb: Query adapter DCB capabilities.	2013-08-27 15:21:13 -04:00
Makefile
qla3xxx.c	drivers:net: Remove unnecessary OOM messages after netdev_alloc_skb	2013-03-09 16:09:19 -05:00
qla3xxx.h