David S. Miller 13dfb3fa49 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Just minor overlapping changes in the conflicts here.

Signed-off-by: David S. Miller <davem@davemloft.net>

2019-08-06 18:44:57 -07:00

..

admtek

…

ath

mac80211: pass the vif to cancel_remain_on_channel

2019-07-26 13:08:28 +02:00

atmel

…

broadcom

wireless: fix nl80211 vendor commands

2019-07-20 21:37:26 +02:00

cisco

…

intel

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2019-08-06 18:44:57 -07:00

intersil

…

marvell

mwifiex: fix 802.11n/WPA detection

2019-07-30 18:00:46 +03:00

mediatek

net: Remove dev_err() usage after platform_get_irq()

2019-07-30 14:37:35 -07:00

quantenna

…

ralink

…

realtek

…

rsi

mac80211: pass the vif to cancel_remain_on_channel

2019-07-26 13:08:28 +02:00

st

…

ti

mac80211: pass the vif to cancel_remain_on_channel

2019-07-26 13:08:28 +02:00

zydas

…

Kconfig

…

mac80211_hwsim.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2019-08-06 18:44:57 -07:00

mac80211_hwsim.h

…

Makefile

…

ray_cs.c

…

ray_cs.h

…

rayctl.h

…

rndis_wlan.c

…

virt_wifi.c

…

wl3501_cs.c

…

wl3501.h

…