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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-testmode.c

2012-04-26 15:03:48 -04:00

..

ath

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

2012-04-26 15:03:48 -04:00

b43

drivers/net: add missing __devexit_p() annotations

2012-04-21 15:28:47 -04:00

b43legacy

…

brcm80211

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

2012-04-23 23:15:17 -04:00

hostap

…

ipw2x00

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

2012-04-18 14:27:48 -04:00

iwlegacy

…

iwlwifi

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

2012-04-26 15:03:48 -04:00

iwmc3200wifi

drivers/net: iwmc3200 depends on EXPERIMENTAL

2012-04-21 15:28:47 -04:00

libertas

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

2012-04-26 15:03:48 -04:00

libertas_tf

…

mwifiex

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

2012-04-26 15:03:48 -04:00

orinoco

…

p54

drivers/net: add missing __devexit_p() annotations

2012-04-21 15:28:47 -04:00

prism54

…

rt2x00

rt2800: add chipset revision RT5390R support

2012-04-23 15:37:42 -04:00

rtl818x

…

rtlwifi

rtlwifi: rtl8192se: Convert driver to use private dm struct

2012-04-23 15:35:33 -04:00

ti

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

2012-04-18 14:27:48 -04:00

zd1211rw

…

adm8211.c

…

adm8211.h

…

airo_cs.c

…

airo.c

…

airo.h

…

at76c50x-usb.c

…

at76c50x-usb.h

…

atmel_cs.c

…

atmel_pci.c

…

atmel.c

…

atmel.h

…

Kconfig

…

mac80211_hwsim.c

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

2012-04-18 14:27:48 -04:00

mac80211_hwsim.h

…

Makefile

…

mwl8k.c

…

ray_cs.c

…

ray_cs.h

…

rayctl.h

…

rndis_wlan.c

…

wl3501_cs.c

…

wl3501.h

…

zd1201.c

…

zd1201.h

…