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
..
brcmfmac	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-10-01 17:06:14 -04:00
brcmsmac	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-10-01 17:06:14 -04:00
brcmutil	brcmutil: simplify brcmu_pkt_free_skb()	2013-04-22 15:20:21 -04:00
include	brcm80211: Remove extern from function prototypes	2013-09-24 17:32:48 -07:00
Kconfig	brcmfmac: fix bus interface selection in Kconfig	2013-09-09 14:40:54 -04:00
Makefile	brcm80211: Use normal DEBUG define	2012-01-24 14:21:13 -05:00