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

Conflicts:
	drivers/net/vmxnet3/vmxnet3_ethtool.c
	net/core/dev.c

2011-05-17 17:33:11 -04:00

..

ath

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

2011-05-17 17:33:11 -04:00

b43

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

2011-05-16 19:32:19 -04:00

b43legacy

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

2011-05-16 19:32:19 -04: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-17 17:33:11 -04:00

iwlwifi

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

2011-05-16 19:32:19 -04:00

iwmc3200wifi

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

2011-05-16 19:32:19 -04:00

libertas

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

2011-05-17 17:33:11 -04:00

libertas_tf

…

mwifiex

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

2011-05-16 19:32:19 -04: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-16 19:32:19 -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-16 19:32:19 -04:00

rtl818x

…

rtlwifi

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

2011-05-16 19:32:19 -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-16 19:32:19 -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

…

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.h

…

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: Do not ask mac80211 to generate IV for crypto keys

2011-05-05 14:59:24 -04:00

ray_cs.c

…

ray_cs.h

…

rayctl.h

Fix common misspellings

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

rndis_wlan.c

…

wl3501_cs.c

Fix common misspellings

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

wl3501.h

…

zd1201.c

…

zd1201.h

…