David S. Miller b20b378d49 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/mediatek/mtk_eth_soc.c drivers/net/ethernet/qlogic/qed/qed_dcbx.c drivers/net/phy/Kconfig All conflicts were cases of overlapping commits. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-09-12 15:52:44 -07:00
..
admtek	cfg80211: remove enum ieee80211_band	2016-04-12 15:56:15 +02:00
ath	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-09-12 15:52:44 -07:00
atmel	mac80211: Add support for beacon report radio measurement	2016-07-06 14:53:19 +02:00
broadcom	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-09-12 15:52:44 -07:00
cisco	wireless: airo: rename 'register' variable	2016-06-29 18:56:20 +03:00
intel	iwlwifi: mvm: Advertise support for AP channel width change	2016-08-29 22:29:06 +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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-09-12 15:52:44 -07:00
mediatek	cfg80211: remove enum ieee80211_band	2016-04-12 15:56:15 +02:00
ralink	rt2800lib: enable MFP if hw crypt is disabled	2016-04-26 12:30:43 +03:00
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	treewide: replace dev->trans_start update with helper	2016-05-04 14:16:49 -04:00
Kconfig	mac80211_hwsim: move Kconfig entry for sorting alphabetically	2015-11-18 15:23:36 +02:00
Makefile	ath: unify Kconfig with other vendors	2015-11-18 14:28:31 +02:00
mac80211_hwsim.c	mac80211: Add support for beacon report radio measurement	2016-07-06 14:53:19 +02:00
mac80211_hwsim.h	drivers/wireless: use nla_put_u64_64bit()	2016-04-26 12:00:48 -04:00
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