John W. Linville b35c809708 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless ...

Conflicts:
	drivers/net/wireless/iwlwifi/pcie/trans.c
	net/mac80211/ibss.c

2013-08-28 10:36:09 -04:00

..

ath

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

2013-08-28 10:36:09 -04:00

b43

b43: call PCIe up and down functions

2013-08-26 14:09:04 -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: use bcma PCIe up and down functions

2013-08-26 14:09:03 -04:00

cw1200

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

2013-08-09 15:06:28 -04:00

hostap

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

2013-08-28 10:36:09 -04:00

ipw2x00

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

2013-07-09 18:24:39 -07:00

iwlegacy

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

2013-08-28 10:36:09 -04:00

iwlwifi

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

2013-08-28 10:36:09 -04:00

libertas

net: wireless: replace strict_strtoul() with kstrtoul()

2013-06-03 00:39:46 -07:00

libertas_tf

mac80211: Use a cfg80211_chan_def in ieee80211_hw_conf_chan

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

mwifiex

mwifiex: add missing endian conversions

2013-08-26 14:10:38 -04:00

orinoco

net/trivial: replace numeric with standard PM state macros

2013-06-28 22:11:48 -07:00

p54

net: wireless: p54spi: Fix commenting style

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

prism54

…

rt2x00

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

2013-08-28 10:36:09 -04:00

rtl818x

Update e-mail address for Andrea Merello (resubmit)

2013-08-26 14:10:40 -04:00

rtlwifi

rtlwifi: sparse warnings: cast to restricted type

2013-08-15 16:08:08 -04:00

ti

mac80211: add vif to testmode cmd

2013-08-12 14:11:42 +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

drivers: avoid parsing names as kthread_run() format strings

2013-07-03 16:07:41 -07: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

atmel: printing bogus information

2013-05-22 14:51:11 -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

mac80211: add vif to testmode cmd

2013-08-12 14:11:42 +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

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

…