David S. Miller 5b79c2af66 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Lots of easy overlapping changes in the confict
resolutions here.

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

2018-05-26 19:46:15 -04:00

..

admtek

net/wireless: fix spaces and grammar copy/paste in vendor Kconfig help text

2018-03-13 18:52:25 +02:00

ath

mac80211: Support adding duration for prepare_tx() callback

2018-05-23 11:06:10 +02:00

atmel

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2018-04-05 11:56:35 -07:00

broadcom

brcmfmac: fix initialization of struct cfg80211_inform_bss variable

2018-05-15 18:03:35 +03:00

cisco

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2018-04-03 14:04:18 -07:00

intel

mac80211: Support adding duration for prepare_tx() callback

2018-05-23 11:06:10 +02:00

intersil

wireless: Use octal not symbolic permissions

2018-03-27 11:01:13 +03:00

marvell

wireless-drivers: Dynamically allocate struct station_info

2018-05-12 11:51:14 +03:00

mediatek

mt76x2: add a polling delay in mt76x2_mac_stop routine

2018-05-12 11:54:02 +03:00

quantenna

wireless-drivers: Dynamically allocate struct station_info

2018-05-12 11:51:14 +03:00

ralink

rt2x00: check against flushing empty queue

2018-05-04 15:34:20 +03:00

realtek

rtlwifi: remove duplicate definition of antenna number for btcoex

2018-05-09 13:23:00 +03:00

rsi

rsi: Set wowlan flag while writing wowlan config parameters

2018-05-15 08:37:50 +03:00

st

cw1200: fix spelling mistake: "Mailformed" -> "Malformed"

2018-04-24 20:23:05 +03:00

ti

wlcore: sdio: allow pm to handle sdio power

2018-04-30 13:30:42 +03:00

zydas

net/wireless: fix spaces and grammar copy/paste in vendor Kconfig help text

2018-03-13 18:52:25 +02:00

Kconfig

qtnfmac: introduce new FullMAC driver for Quantenna chipsets

2017-05-24 17:04:13 +03:00

mac80211_hwsim.c

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

2018-05-26 19:46:15 -04:00

mac80211_hwsim.h

mac80211_hwsim: add permanent mac address option for new radios

2018-01-31 12:45:35 +01:00

Makefile

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

ray_cs.c

wireless: Use octal not symbolic permissions

2018-03-27 11:01:13 +03:00

ray_cs.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

rayctl.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

rndis_wlan.c

Merge tag 'mac80211-next-for-davem-2017-04-28' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

2017-04-28 14:41:15 -04:00

wl3501_cs.c

wl3501_cs: fix spelling mistake: "Insupported" -> "Unsupported"

2017-07-28 18:06:31 +03:00

wl3501.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00