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

Conflicts:
	net/mac80211/main.c

2010-09-09 22:27:33 -07:00

..

ath

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

2010-09-09 22:27:33 -07:00

b43

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

2010-09-02 13:30:07 -04:00

b43legacy

b43legacy: update hw/fw version info in wiphy struct

2010-08-16 14:39:45 -04:00

hostap

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

2010-08-25 14:51:42 -04:00

ipw2x00

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

2010-08-25 14:51:42 -04:00

iwlwifi

iwlwifi: allow using multiple contexts

2010-08-27 09:49:38 -07:00

iwmc3200wifi

iwm3200wifi: remove comparison to WIFI_IF_NTFY_MAX in iwm_ntf_wifi_if_wrapper

2010-08-16 14:39:48 -04:00

libertas

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

2010-09-09 22:27:33 -07:00

libertas_tf

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

2010-08-25 14:51:42 -04:00

orinoco

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

2010-09-02 13:30:07 -04:00

p54

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

2010-09-09 22:27:33 -07:00

prism54

drivers/net/wireless/prism54: Adjust confusing if indentation

2010-08-16 15:26:41 -04:00

rt2x00

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

2010-09-02 13:30:07 -04:00

rtl818x

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

2010-08-24 16:35:40 -04:00

wl12xx

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

2010-09-02 13:30:07 -04:00

zd1211rw

zd1211rw: update fw version info in wiphy struct

2010-08-16 14:39:45 -04:00

adm8211.c

drivers/net/wireless: Restore upper case words in wiphy_<level> messages

2010-08-18 16:37:44 -04:00

adm8211.h

drivers/net: use __packed annotation

2010-06-03 03:18:23 -07:00

airo_cs.c

pcmcia: do not request windows if you don't need to

2010-08-03 09:04:21 +02:00

airo.c

drivers/net: Convert unbounded kzalloc calls to kcalloc

2010-08-17 17:45:14 -07:00

airo.h

…

at76c50x-usb.c

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

2010-08-24 16:35:40 -04:00

at76c50x-usb.h

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

2010-07-01 17:34:14 -07:00

atmel_cs.c

pcmcia: do not use io_req_t when calling pcmcia_request_io()

2010-08-03 09:04:11 +02:00

atmel_pci.c

…

atmel.c

net: trans_start cleanups

2010-05-10 05:01:31 -07:00

atmel.h

…

Kconfig

wireless: depends on NET

2010-05-10 14:56:49 -04:00

mac80211_hwsim.c

mac80211_hwsim: support runtime iftype changes

2010-08-27 13:53:31 -04:00

Makefile

…

mwl8k.c

drivers/net/wireless: Restore upper case words in wiphy_<level> messages

2010-08-18 16:37:44 -04:00

ray_cs.c

drivers/net: Remove address use from assignments of function pointers

2010-08-25 15:35:43 -07:00

ray_cs.h

pcmcia: dev_node removal (drivers with unregister_netdev check)

2010-05-10 10:23:16 +02:00

rayctl.h

…

rndis_wlan.c

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

2010-07-01 17:34:14 -07:00

wl3501_cs.c

ethtool: Provide a default implementation of ethtool_ops::get_drvinfo

2010-08-17 02:31:15 -07:00

wl3501.h

drivers/net: use __packed annotation

2010-06-03 03:18:23 -07:00

zd1201.c

drivers/net: Remove unnecessary returns from void function()s

2010-05-14 00:19:28 -07:00

zd1201.h

…