David S. Miller a210576cf8 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/mac80211/sta_info.c net/wireless/core.h Two minor conflicts in wireless. Overlapping additions of extern declarations in net/wireless/core.h and a bug fix overlapping with the addition of a boolean parameter to __ieee80211_key_free(). Signed-off-by: David S. Miller <davem@davemloft.net>		2013-04-01 13:36:50 -04:00
..
ath	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-01 13:36:50 -04:00
b43	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-01 13:36:50 -04:00
b43legacy	drivers:net: dma_alloc_coherent: use __GFP_ZERO instead of memset(, 0)	2013-03-17 12:50:24 -04:00
brcm80211	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-01 13:36:50 -04:00
hostap	net: wireless: hostap: hostap_ap.c: Return -ENOMEM instead of -1 for if kmalloc() fails.	2013-02-18 15:30:40 -05:00
ipw2x00	Driver core patches for 3.9-rc1	2013-02-21 12:05:51 -08:00
iwlegacy	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-01 13:36:50 -04:00
iwlwifi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-01 13:36:50 -04:00
libertas	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem	2013-03-01 13:52:03 -05:00
libertas_tf	…
mwifiex	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-01 13:36:50 -04:00
orinoco	orinoco_usb: don't release nonexistent firmware	2013-03-11 15:06:13 -04:00
p54	Driver core patches for 3.9-rc1	2013-02-21 12:05:51 -08:00
prism54	wireless: Remove unnecessary alloc/OOM messages, alloc cleanups	2013-02-04 13:22:34 -05:00
rt2x00	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2013-03-20 15:24:57 -04:00
rtl818x	drivers/net/wireless/rtl818x: remove depends on CONFIG_EXPERIMENTAL	2013-01-22 12:01:35 -08:00
rtlwifi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-03-22 12:53:09 -04:00
ti	mac80211: Allow drivers to differentiate between ROC types	2013-03-06 16:35:49 +01:00
zd1211rw	Driver core patches for 3.9-rc1	2013-02-21 12:05:51 -08:00
Kconfig	drivers/net/wireless: remove depends on CONFIG_EXPERIMENTAL	2013-01-22 12:01:35 -08:00
Makefile	wireless: fix Atheros drivers compilation	2012-12-17 15:48:43 -05:00
adm8211.c	wireless: remove __dev* attributes	2012-12-06 15:04:55 -05:00
adm8211.h	…
airo.c	wireless: remove __dev* attributes	2012-12-06 15:04:55 -05:00
airo.h	…
airo_cs.c	wireless: Remove unnecessary alloc/OOM messages, alloc cleanups	2013-02-04 13:22:34 -05:00
at76c50x-usb.c	wireless: Remove unnecessary alloc/OOM messages, alloc cleanups	2013-02-04 13:22:34 -05:00
at76c50x-usb.h	…
atmel.c	treewide: fix typo of "suport" in various comments and Kconfig	2012-11-19 14:16:09 +01:00
atmel.h	…
atmel_cs.c	wireless: Remove unnecessary alloc/OOM messages, alloc cleanups	2013-02-04 13:22:34 -05:00
atmel_pci.c	atmel: remove __dev* attributes	2012-12-06 15:04:56 -05:00
mac80211_hwsim.c	mac80211: Allow drivers to differentiate between ROC types	2013-03-06 16:35:49 +01:00
mac80211_hwsim.h	…
mwl8k.c	mwl8k: don't overwrite regulatory settings on fw reload	2013-03-11 15:06:14 -04:00
ray_cs.c	net: add ETH_P_802_3_MIN	2013-03-28 01:20:42 -04: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	…
zd1201.c	hlist: drop the node parameter from iterators	2013-02-27 19:10:24 -08:00
zd1201.h	…