David S. Miller 0ddead90b2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The conflicts were two cases of overlapping changes in batman-adv and the qed driver. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-06-15 11:59:32 -04:00
..
b43	b43: Add missing MODULE_FIRMWARE()	2017-05-22 12:02:46 +03:00
b43legacy	wireless: Set NL80211_EXT_FEATURE_CQM_RSSI_LIST in multiple drivers	2017-03-06 09:21:39 +01:00
brcm80211	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-15 11:59:32 -04:00
Kconfig	brcm80211: move under broadcom vendor directory	2015-11-18 11:24:22 +02:00
Makefile	brcm80211: move under broadcom vendor directory	2015-11-18 11:24:22 +02:00