David S. Miller c3fa32b976 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/qmi_wwan.c include/net/dst.h Trivial merge conflicts, both were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-10-23 16:49:34 -04:00
..
ath	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-10-23 16:49:34 -04:00
b43	net:drivers/net: Miscellaneous conversions to ETH_ALEN	2013-10-02 17:04:45 -04:00
b43legacy	net:drivers/net: Miscellaneous conversions to ETH_ALEN	2013-10-02 17:04:45 -04:00
brcm80211	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2013-10-17 14:02:07 -04:00
cw1200	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-10-23 16:49:34 -04:00
hostap	net:drivers/net: Miscellaneous conversions to ETH_ALEN	2013-10-02 17:04:45 -04:00
ipw2x00	Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next	2013-10-07 15:40:44 -04:00
iwlegacy	Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next	2013-10-07 15:40:44 -04:00
iwlwifi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-10-23 16:49:34 -04:00
libertas	wireless: libertas: use dev_get_platdata()	2013-09-26 15:13:39 -04:00
libertas_tf	mac80211: Use a cfg80211_chan_def in ieee80211_hw_conf_chan	2013-03-25 19:19:35 +01:00
mwifiex	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-10-23 16:49:34 -04:00
orinoco	Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next	2013-10-07 15:40:44 -04:00
p54	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2013-10-17 14:02:07 -04:00
prism54	net:drivers/net: Miscellaneous conversions to ETH_ALEN	2013-10-02 17:04:45 -04:00
rt2x00	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2013-10-17 14:02:07 -04:00
rtl818x	wireless: rtl818x: remove unnecessary pci_set_drvdata()	2013-09-26 15:13:45 -04:00
rtlwifi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-10-23 16:49:34 -04:00
ti	net: wireless: wl1251: update firmware path	2013-10-10 13:46:00 -04:00
zd1211rw	mac80211: Use a cfg80211_chan_def in ieee80211_hw_conf_chan	2013-03-25 19:19:35 +01:00
Kconfig	cw1200: add driver for the ST-E CW1100 & CW1200 WLAN chipsets	2013-05-29 15:26:40 -04:00
Makefile	cw1200: add driver for the ST-E CW1100 & CW1200 WLAN chipsets	2013-05-29 15:26:40 -04:00
adm8211.c	wireless: adm8211: remove unnecessary pci_set_drvdata()	2013-09-26 15:13:42 -04: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	drivers/net: use module_pcmcia_driver() in pcmcia drivers	2013-03-15 12:27:33 -07:00
at76c50x-usb.c	mac80211: Use a cfg80211_chan_def in ieee80211_hw_conf_chan	2013-03-25 19:19:35 +01:00
at76c50x-usb.h	…
atmel.c	net:drivers/net: Miscellaneous conversions to ETH_ALEN	2013-10-02 17:04:45 -04:00
atmel.h	…
atmel_cs.c	drivers/net: use module_pcmcia_driver() in pcmcia drivers	2013-03-15 12:27:33 -07:00
atmel_pci.c	…
mac80211_hwsim.c	mac80211_hwsim: fix error return code in init_mac80211_hwsim()	2013-08-26 09:52:58 +02:00
mac80211_hwsim.h	…
mwl8k.c	wireless: mwl8k: remove unnecessary pci_set_drvdata()	2013-09-26 15:13:44 -04:00
ray_cs.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-05-01 17:51:54 -07:00
ray_cs.h	…
rayctl.h	…
rndis_wlan.c	rndis_wlan: update email address	2013-03-08 15:58:54 -05:00
wl3501.h	…
wl3501_cs.c	drivers/net: use module_pcmcia_driver() in pcmcia drivers	2013-03-15 12:27:33 -07: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	…