David S. Miller b633353115 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/phy/bcm7xxx.c drivers/net/phy/marvell.c drivers/net/vxlan.c All three conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-02-23 00:09:14 -05:00
..
admtek	adm80211: move under admtek vendor directory	2015-11-17 19:49:19 +02:00
ath	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-01 15:56:08 -08:00
atmel	atmel: move under atmel vendor directory	2015-11-18 11:19:07 +02:00
broadcom	Major changes:	2016-02-16 20:38:29 -05:00
cisco	wireless: airo: re-use mac_pton()	2015-11-30 14:59:28 +02:00
intel	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
intersil	hostap: avoid uninitialized variable use in hfa384x_get_rid	2016-02-06 13:59:24 +02:00
marvell	mwifiex: firmware dump support for w8997 chipset	2016-02-07 09:15:44 +02:00
mediatek	mediatek: unify Kconfig with other vendors	2015-11-18 14:28:31 +02:00
ralink	Major changes:	2016-02-16 20:38:29 -05:00
realtek	rtlwifi: fix broken VHT support	2016-02-06 12:56:18 +02:00
rsi	rsi: bool tests do not need comparison	2015-12-30 17:34:26 +02:00
st	cw1200: remove some dead code	2015-12-11 13:15:08 +02:00
ti	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
zydas	zd1211rw: move under zydas vendor directory	2015-11-18 14:28:30 +02: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	Revert "mac80211_hwsim: support any address in userspace"	2016-01-14 11:10:17 +01:00
mac80211_hwsim.h	…
ray_cs.c	ray_cs: Change 1 to true for bool type variable.	2015-06-02 23:30:14 +03:00
ray_cs.h	…
rayctl.h	…
rndis_wlan.c	rndis_wlan: fix checking for default value	2015-09-22 16:14:32 -07:00
wl3501.h	…
wl3501_cs.c	…