1
0
Fork 0
alistair23-linux/drivers/net/wireless
David S. Miller ff24e4980a Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Three trivial overlapping conflicts.

Signed-off-by: David S. Miller <davem@davemloft.net>
2019-05-02 22:14:21 -04:00
..
admtek
ath Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2019-05-02 22:14:21 -04:00
atmel
broadcom brcmfmac: fix leak of mypkt on error return path 2019-04-13 14:07:09 +03:00
cisco Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 2018-12-27 13:53:32 -08:00
intel Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2019-05-02 22:14:21 -04:00
intersil orinoco : Replace function name in string with __func__ 2019-02-19 17:17:13 +02:00
marvell Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2019-05-02 22:14:21 -04:00
mediatek mt76x02: avoid status_list.lock and sta->rate_ctrl_lock dependency 2019-04-12 21:32:40 +03:00
quantenna qtnfmac: replace qtnf_cmd_acl_data_size() with struct_size() 2019-04-04 19:38:36 +03:00
ralink rt2x00: do not increment sequence number while re-transmitting 2019-04-12 21:31:07 +03:00
realtek rtlwifi: rtl8188ee: Remove extraneous file 2019-04-18 16:08:23 +03:00
rsi rsi: fix missing null pointer check from a failed ieee80211_probereq_get call 2019-02-28 10:28:36 +02:00
st cw1200: no need to check return value of debugfs_create functions 2019-02-01 14:34:56 +02:00
ti netlink: make validation more configurable for future strictness 2019-04-27 17:07:21 -04:00
zydas zd1201: mark expected switch fall-through 2018-11-06 19:00:12 +02:00
Kconfig mac80211-next: rtnetlink wifi simulation device 2018-12-05 15:31:31 +01:00
Makefile mac80211-next: rtnetlink wifi simulation device 2018-12-05 15:31:31 +01:00
mac80211_hwsim.c genetlink: optionally validate strictly/dumps 2019-04-27 17:07:22 -04:00
mac80211_hwsim.h mac80211_hwsim: allow configurable cipher types 2018-11-09 11:36:15 +01:00
ray_cs.c wireless: remove unneeded semicolon 2019-02-01 14:25:41 +02:00
ray_cs.h
rayctl.h
rndis_wlan.c
virt_wifi.c virt_wifi: Remove REGULATORY_WIPHY_SELF_MANAGED 2019-02-11 17:10:48 +01:00
wl3501.h
wl3501_cs.c