David S. Miller f188b951f3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/renesas/ravb_main.c kernel/bpf/syscall.c net/ipv4/ipmr.c All three conflicts were cases of overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-12-03 21:09:12 -05:00
..
admtek	adm80211: move under admtek vendor directory	2015-11-17 19:49:19 +02:00
ath	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-12-03 21:09:12 -05:00
atmel	atmel: move under atmel vendor directory	2015-11-18 11:19:07 +02:00
broadcom	brcm80211: move under broadcom vendor directory	2015-11-18 11:24:22 +02:00
cisco	airo: move under cisco vendor directory	2015-11-18 11:18:34 +02:00
intel	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-12-03 21:09:12 -05:00
intersil	prism54: move under intersil vendor directory	2015-11-18 14:28:31 +02:00
marvell	mwl8k: move under marvell vendor directory	2015-11-18 14:28:30 +02:00
mediatek	mediatek: unify Kconfig with other vendors	2015-11-18 14:28:31 +02:00
ralink	rt2x00: move under ralink vendor directory	2015-11-18 14:28:31 +02:00
realtek	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-12-03 21:09:12 -05:00
rsi	rsi: add vendor Kconfig entry	2015-11-18 14:28:31 +02:00
st	cw1200: move under st vendor directory	2015-11-18 14:28:30 +02:00
ti	ti: unify Kconfig with other vendors	2015-11-18 14:28:31 +02:00
zydas	zd1211rw: move under zydas vendor directory	2015-11-18 14:28:30 +02:00
Kconfig	mac80211_hwsim: move Kconfig entry for sorting alphabetically	2015-11-18 15:23:36 +02:00
mac80211_hwsim.c	remove abs64()	2015-11-09 15:11:24 -08:00
mac80211_hwsim.h	mac80211-hwsim: Add HWSIM_CMD_GET_RADIO command	2014-11-19 18:59:32 +01:00
Makefile	ath: unify Kconfig with other vendors	2015-11-18 14:28:31 +02:00
ray_cs.c	ray_cs: Change 1 to true for bool type variable.	2015-06-02 23:30:14 +03:00
ray_cs.h
rayctl.h
rndis_wlan.c	rndis_wlan: fix checking for default value	2015-09-22 16:14:32 -07:00
wl3501_cs.c
wl3501.h