1
0
Fork 0
alistair23-linux/drivers/net/wireless
David S. Miller 1602f49b58 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts were two cases of simple overlapping changes,
nothing serious.

In the UDP case, we need to add a hlist_add_tail_rcu()
to linux/rculist.h, because we've moved UDP socket handling
away from using nulls lists.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-04-23 18:51:33 -04:00
..
admtek cfg80211: remove enum ieee80211_band 2016-04-12 15:56:15 +02:00
ath cfg80211: remove enum ieee80211_band 2016-04-12 15:56:15 +02:00
atmel cfg80211: remove enum ieee80211_band 2016-04-12 15:56:15 +02:00
broadcom cfg80211: remove enum ieee80211_band 2016-04-12 15:56:15 +02: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-04-23 18:51:33 -04:00
intersil cfg80211: remove enum ieee80211_band 2016-04-12 15:56:15 +02:00
marvell cfg80211: remove enum ieee80211_band 2016-04-12 15:56:15 +02:00
mediatek cfg80211: remove enum ieee80211_band 2016-04-12 15:56:15 +02:00
ralink cfg80211: remove enum ieee80211_band 2016-04-12 15:56:15 +02:00
realtek Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-04-23 18:51:33 -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: 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 cfg80211: remove enum ieee80211_band 2016-04-12 15:56:15 +02:00
mac80211_hwsim.h mac80211-hwsim: Add HWSIM_CMD_GET_RADIO command 2014-11-19 18:59:32 +01:00
ray_cs.c ray_cs: Change 1 to true for bool type variable. 2015-06-02 23:30:14 +03:00
ray_cs.h ray_cs: Add include guards 2014-08-28 14:41:56 -04:00
rayctl.h ray_cs: Add include guards 2014-08-28 14:41:56 -04:00
rndis_wlan.c cfg80211: remove enum ieee80211_band 2016-04-12 15:56:15 +02:00
wl3501.h
wl3501_cs.c cfg80211: remove enum ieee80211_band 2016-04-12 15:56:15 +02:00