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
..
Makefile
qlge_dbg.c	qlge: call ql_core_dump() only if dump memory was allocated.	2013-09-24 11:19:46 -04:00
qlge_ethtool.c	qlge: Fix ethtool autoneg advertising.	2013-04-19 17:53:56 -04:00
qlge_main.c	qlge: Enhance nested VLAN (Q-in-Q) handling.	2013-09-27 17:02:20 -04:00
qlge_mpi.c	qlge: call ql_core_dump() only if dump memory was allocated.	2013-09-24 11:19:46 -04:00
qlge.h	qlge: Update version to 1.00.00.33	2013-09-27 17:02:20 -04:00