David S. Miller 56a4342dfe Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c net/ipv6/ip6_tunnel.c net/ipv6/ip6_vti.c ipv6 tunnel statistic bug fixes conflicting with consolidation into generic sw per-cpu net stats. qlogic conflict between queue counting bug fix and the addition of multiple MAC address support. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-01-06 17:37:45 -05:00
..
ath	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-01-06 17:37:45 -05:00
b43	Merge branch 'for-linus-dma-masks' of git://git.linaro.org/people/rmk/linux-arm	2013-11-14 07:55:21 +09:00
b43legacy	Merge branch 'for-linus-dma-masks' of git://git.linaro.org/people/rmk/linux-arm	2013-11-14 07:55:21 +09:00
brcm80211	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2014-01-01 15:39:56 -05:00
cw1200	cw1200: slight optimization of addr compare	2013-12-26 13:31:35 -05:00
hostap	wireless: slight optimization of addr compare	2013-12-26 13:31:35 -05:00
ipw2x00	ipw2x00: slight optimization of addr compare	2013-12-26 13:31:35 -05:00
iwlegacy	drivers: net: Mark functions as static in debug.c	2013-12-19 18:51:21 -05:00
iwlwifi	Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next	2013-12-18 15:09:58 -05:00
libertas	drivers/net/wireless: Fix FSF address in file headers	2013-12-11 10:56:20 -05:00
libertas_tf
mwifiex	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2014-01-01 15:39:56 -05:00
orinoco	Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next	2013-10-07 15:40:44 -04:00
p54	drivers/net/wireless: Fix FSF address in file headers	2013-12-11 10:56:20 -05:00
prism54	wireless: slight optimization of addr compare	2013-12-26 13:31:35 -05:00
rt2x00	rt2x00: Fix FSF address in file headers	2013-12-11 10:56:19 -05:00
rtl818x	rtl8187: Increase RX queue depth	2013-12-05 14:54:53 -05:00
rtlwifi	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-01-06 17:37:45 -05:00
ti	wireless: slight optimization of addr compare	2013-12-26 13:31:35 -05:00
zd1211rw	zd1211rw: slight optimization of addr compare	2013-12-26 13:31:33 -05:00
adm8211.c	wireless: slight optimization of addr compare	2013-12-26 13:31:35 -05:00
adm8211.h
airo.c	wireless: airo: remove unnecessary pci_set_drvdata()	2013-09-26 15:13:42 -04:00
airo.h
airo_cs.c
at76c50x-usb.c
at76c50x-usb.h
atmel.c	drivers/net/wireless: Fix FSF address in file headers	2013-12-11 10:56:20 -05:00
atmel.h	drivers/net/wireless: Fix FSF address in file headers	2013-12-11 10:56:20 -05:00
atmel_cs.c	drivers/net/wireless: Fix FSF address in file headers	2013-12-11 10:56:20 -05:00
atmel_pci.c	drivers/net/wireless: Fix FSF address in file headers	2013-12-11 10:56:20 -05:00
Kconfig	cw1200: add driver for the ST-E CW1100 & CW1200 WLAN chipsets	2013-05-29 15:26:40 -04:00
mac80211_hwsim.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2013-12-06 09:50:45 -05:00
mac80211_hwsim.h
Makefile	cw1200: add driver for the ST-E CW1100 & CW1200 WLAN chipsets	2013-05-29 15:26:40 -04:00
mwl8k.c	wireless: mwl8k: remove unnecessary pci_set_drvdata()	2013-09-26 15:13:44 -04:00
ray_cs.c	drivers/net/wireless: Fix FSF address in file headers	2013-12-11 10:56:20 -05:00
ray_cs.h
rayctl.h
rndis_wlan.c	drivers/net/wireless: Fix FSF address in file headers	2013-12-11 10:56:20 -05:00
wl3501.h
wl3501_cs.c	wireless: slight optimization of addr compare	2013-12-26 13:31:35 -05:00
zd1201.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2013-08-28 10:36:09 -04:00
zd1201.h