Johannes Berg 51217cee3a Merge remote-tracking branch 'wireless-next/master' into HEAD ...

Merge to get the wil6210 changes that a cfg80211 change needs.
A conflict in drivers/net/wireless/ath/ath9k/init.c was just
whitespace changes.

Also fix a semantic conflict due to cw1200 using WoWLAN which
I had modified in my tree.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

2013-06-04 13:02:42 +02:00

..

ath

Merge remote-tracking branch 'wireless-next/master' into HEAD

2013-06-04 13:02:42 +02:00

b43

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem

2013-05-10 10:29:24 -04:00

b43legacy

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

2013-04-24 10:54:20 -04:00

brcm80211

brcmsmac: Reduce log spam in heavy tx, make err print in debug

2013-06-03 15:55:48 -04:00

cw1200

Merge remote-tracking branch 'wireless-next/master' into HEAD

2013-06-04 13:02:42 +02:00

hostap

wireless: single_open() leaks

2013-05-05 00:13:20 -04:00

ipw2x00

net, ipw2x00: remove redundant D0 power state set

2013-06-03 15:55:45 -04:00

iwlegacy

Merge remote-tracking branch 'mac80211/master' into mac80211-next

2013-05-25 00:01:30 +02:00

iwlwifi

Merge remote-tracking branch 'wireless-next/master' into HEAD

2013-06-04 13:02:42 +02:00

libertas

drivers/net: use module_pcmcia_driver() in pcmcia drivers

2013-03-15 12:27:33 -07:00

libertas_tf

mac80211: Use a cfg80211_chan_def in ieee80211_hw_conf_chan

2013-03-25 19:19:35 +01:00

mwifiex

Merge remote-tracking branch 'wireless-next/master' into HEAD

2013-06-04 13:02:42 +02:00

orinoco

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

2013-05-01 14:08:52 -07:00

p54

net: wireless: p54spi: Fix commenting style

2013-05-29 15:22:46 -04:00

prism54

wireless: Remove unnecessary alloc/OOM messages, alloc cleanups

2013-02-04 13:22:34 -05:00

rt2x00

rt2800: move 53xx specific bbp initialization

2013-05-24 13:18:21 -04:00

rtl818x

mac80211: Use a cfg80211_chan_def in ieee80211_hw_conf_chan

2013-03-25 19:19:35 +01:00

rtlwifi

rtlwifi: rtl8192cu: Fix false loss of AP indication

2013-04-26 08:42:23 -04:00

ti

cfg80211: take WoWLAN support information out of wiphy struct

2013-06-03 18:43:34 +02:00

zd1211rw

mac80211: Use a cfg80211_chan_def in ieee80211_hw_conf_chan

2013-03-25 19:19:35 +01:00

adm8211.c

mac80211: Use a cfg80211_chan_def in ieee80211_hw_conf_chan

2013-03-25 19:19:35 +01:00

adm8211.h

…

airo_cs.c

drivers/net: use module_pcmcia_driver() in pcmcia drivers

2013-03-15 12:27:33 -07:00

airo.c

airo: Use remove_proc_subtree()

2013-05-01 17:29:42 -04:00

airo.h

…

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_cs.c

drivers/net: use module_pcmcia_driver() in pcmcia drivers

2013-03-15 12:27:33 -07:00

atmel_pci.c

…

atmel.c

wireless: single_open() leaks

2013-05-05 00:13:20 -04:00

atmel.h

…

Kconfig

cw1200: add driver for the ST-E CW1100 & CW1200 WLAN chipsets

2013-05-29 15:26:40 -04:00

mac80211_hwsim.c

Revert "mac80211_hwsim: remove P2P_DEVICE support"

2013-05-31 10:23:05 +02: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

mwl8k: Fix the firmware hang issue for 8764

2013-05-24 13:18:22 -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_cs.c

drivers/net: use module_pcmcia_driver() in pcmcia drivers

2013-03-15 12:27:33 -07:00

wl3501.h

…

zd1201.c

hlist: drop the node parameter from iterators

2013-02-27 19:10:24 -08:00

zd1201.h

…