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

…

ath

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

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

atmel

…

broadcom

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

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

cisco

…

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

…

quantenna

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

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

ralink

…

realtek

…

rsi

…

st

…

ti

…

zydas

…

Kconfig

…

mac80211_hwsim.c

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

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

mac80211_hwsim.h

…

Makefile

…

ray_cs.c

…

ray_cs.h

…

rayctl.h

…

rndis_wlan.c

…

wl3501_cs.c

…

wl3501.h

…