David S. Miller 60747ef4d1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Minor overlapping changes for both merge conflicts. Resolution work done by Stephen Rothwell was used as a reference. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-08-18 01:17:32 -04:00
..
admtek
ath	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-08-18 01:17:32 -04:00
atmel	mac80211: Add support for beacon report radio measurement	2016-07-06 14:53:19 +02:00
broadcom	net: wireless: broadcom: brcm80211: brcmfmac: usb: don't print error when allocating urb fails	2016-08-13 14:53:40 -07:00
cisco	wireless: airo: rename 'register' variable	2016-06-29 18:56:20 +03:00
intel	* bump firmware version to load newer firmwares	2016-07-18 22:46:28 +03:00
intersil	net: wireless: intersil: orinoco: orinoco_usb: don't print error when allocating urb fails	2016-08-13 14:53:41 -07:00
marvell	net: wireless: marvell: mwifiex: usb: don't print error when allocating urb fails	2016-08-13 14:53:41 -07:00
mediatek
ralink
realtek	net: wireless: realtek: rtlwifi: usb: don't print error when allocating urb fails	2016-08-13 14:53:41 -07:00
rsi	rsi: eliminate superfluous NULL check	2016-06-14 17:17:58 +03:00
st	mac80211: Add support for beacon report radio measurement	2016-07-06 14:53:19 +02:00
ti	mac80211: Add ieee80211_hw pointer to get_expected_throughput	2016-08-05 14:23:25 +02:00
zydas
Kconfig
mac80211_hwsim.c	mac80211: Add support for beacon report radio measurement	2016-07-06 14:53:19 +02:00
mac80211_hwsim.h
Makefile
ray_cs.c
ray_cs.h
rayctl.h
rndis_wlan.c	nl80211: support beacon report scanning	2016-07-06 14:51:31 +02:00
wl3501.h
wl3501_cs.c	wl3501_cs: avoid bogus gcc-6 warning	2016-06-16 18:06:08 +03:00