David S. Miller 0ddead90b2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

The conflicts were two cases of overlapping changes in
batman-adv and the qed driver.

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

2017-06-15 11:59:32 -04:00

..

admtek

wireless: Set NL80211_EXT_FEATURE_CQM_RSSI_LIST in multiple drivers

2017-03-06 09:21:39 +01:00

ath

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

2017-06-15 11:59:32 -04:00

atmel

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

2017-04-20 13:54:40 -04:00

broadcom

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

2017-06-15 11:59:32 -04:00

cisco

Annotate hardware config module parameters in drivers/net/wireless/

2017-04-20 12:02:32 +01:00

intel

Merge tag 'wireless-drivers-next-for-davem-2017-06-12' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next

2017-06-12 10:14:29 -04:00

intersil

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

2017-06-15 11:59:32 -04:00

marvell

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

2017-06-15 11:59:32 -04:00

mediatek

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

quantenna

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

2017-06-15 11:59:32 -04:00

ralink

rt2x00: Add device ID for Epson WN7512BEP

2017-05-24 16:47:54 +03:00

realtek

rtlwifi: btcoex: 23b 1ant: initialize bt_disabled to false

2017-05-24 16:51:30 +03:00

rsi

rsi: use subdirectory for firmware file

2017-06-01 12:51:19 +03:00

st

mac80211: separate encoding/bandwidth from flags

2017-04-28 10:41:45 +02:00

ti

wlcore: fix 64K page support

2017-05-24 16:42:27 +03:00

zydas

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

2017-04-20 13:54:40 -04:00

Kconfig

qtnfmac: introduce new FullMAC driver for Quantenna chipsets

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

mac80211_hwsim.c

net: Fix inconsistent teardown and release of private netdev state.

2017-06-07 15:53:24 -04:00

mac80211_hwsim.h

mac80211_hwsim: fix command documentation indentation

2017-03-06 09:21:48 +01:00

Makefile

qtnfmac: introduce new FullMAC driver for Quantenna chipsets

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

ray_cs.c

ray_cs: Avoid reading past end of buffer

2017-05-22 18:27:22 +03:00

ray_cs.h

…

rayctl.h

…

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

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

wl3501.h

…