David S. Miller 7143b7d412 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	drivers/net/tg3.c

2011-05-05 14:59:02 -07:00

..

ath

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

2011-05-05 13:32:35 -04:00

b43

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2011-05-05 14:59:02 -07:00

b43legacy

Fix common misspellings

2011-03-31 11:26:23 -03:00

hostap

net: call dev_alloc_name from register_netdevice

2011-05-05 10:57:45 -07:00

ipw2x00

Fix common misspellings

2011-03-31 11:26:23 -03:00

iwlegacy

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2011-05-05 14:59:02 -07:00

iwlwifi

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2011-05-05 14:59:02 -07:00

iwmc3200wifi

Fix common misspellings

2011-03-31 11:26:23 -03:00

libertas

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

2011-05-05 13:32:35 -04:00

libertas_tf

mac80211: make tx() operation return void

2011-02-25 15:32:34 -05:00

mwifiex

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

2011-05-05 14:09:28 -07:00

orinoco

Fix common misspellings

2011-03-31 11:26:23 -03:00

p54

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

2011-05-05 13:32:35 -04:00

prism54

Fix common misspellings

2011-03-31 11:26:23 -03:00

rt2x00

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

2011-05-05 13:32:35 -04:00

rtl818x

rtl8187: Change rate-control feedback

2011-03-04 14:05:17 -05:00

rtlwifi

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

2011-05-05 13:32:35 -04:00

wl12xx

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

2011-05-05 13:32:35 -04:00

wl1251

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

2011-04-12 16:18:44 -04:00

zd1211rw

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

2011-04-12 16:18:44 -04:00

adm8211.c

mac80211: make tx() operation return void

2011-02-25 15:32:34 -05:00

adm8211.h

…

airo_cs.c

…

airo.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

airo.h

…

at76c50x-usb.c

at76c50x-usb: fix warning caused by at76_mac80211_tx now returning void

2011-02-28 13:57:30 -05:00

at76c50x-usb.h

ieee80211: add IEEE80211_COUNTRY_STRING_LEN definition

2011-03-09 16:10:56 -05:00

atmel_cs.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

atmel_pci.c

…

atmel.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

atmel.h

…

Kconfig

wireless: mwifiex: initial commit for Marvell mwifiex driver

2011-03-30 14:15:17 -04:00

mac80211_hwsim.c

net: call dev_alloc_name from register_netdevice

2011-05-05 10:57:45 -07:00

Makefile

wireless: mwifiex: initial commit for Marvell mwifiex driver

2011-03-30 14:15:17 -04:00

mwl8k.c

mwl8k: Reducing extra_tx_headroom for tx optimization in AP mode

2011-04-29 15:36:15 -04:00

ray_cs.c

…

ray_cs.h

…

rayctl.h

Fix common misspellings

2011-03-31 11:26:23 -03:00

rndis_wlan.c

rndis_wlan: use power save only for BCM4320b

2011-02-25 15:21:51 -05:00

wl3501_cs.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

wl3501.h

…

zd1201.c

…

zd1201.h

…