David S. Miller cba6532100 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/ipv4/ip_gre.c Minor conflicts between tunnel bug fixes in net and ipv6 tunnel cleanups in net-next. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-05-04 00:52:29 -04: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-05-04 00:52:29 -04:00
atmel	cfg80211: remove enum ieee80211_band	2016-04-12 15:56:15 +02:00
broadcom	brcm80211: correct speed testing	2016-05-03 15:49:34 -04:00
cisco	cfg80211: remove enum ieee80211_band	2016-04-12 15:56:15 +02:00
intel	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-05-04 00:52:29 -04:00
intersil	prism54: isl_38xx: Replace 'struct timeval'	2016-04-26 12:09:17 +03:00
marvell	mwifiex: increase dwell time for active scan	2016-04-27 16:52:56 +03: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	wireless-drivers patches for 4.7	2016-05-03 00:35:16 -04:00
rsi	cfg80211: remove enum ieee80211_band	2016-04-12 15:56:15 +02:00
st	cfg80211: remove enum ieee80211_band	2016-04-12 15:56:15 +02:00
ti	cfg80211: remove enum ieee80211_band	2016-04-12 15:56:15 +02:00
zydas	cfg80211: remove enum ieee80211_band	2016-04-12 15:56:15 +02:00
Kconfig
mac80211_hwsim.c	drivers/wireless: use nla_put_u64_64bit()	2016-04-26 12:00:48 -04:00
mac80211_hwsim.h	drivers/wireless: use nla_put_u64_64bit()	2016-04-26 12:00:48 -04:00
Makefile
ray_cs.c
ray_cs.h
rayctl.h
rndis_wlan.c	cfg80211: remove enum ieee80211_band	2016-04-12 15:56:15 +02:00
wl3501_cs.c	cfg80211: remove enum ieee80211_band	2016-04-12 15:56:15 +02:00
wl3501.h