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

Conflicts:
	net/mac80211/rate.c

2010-02-14 22:30:54 -08:00

..

ath

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

2010-02-14 22:30:54 -08:00

b43

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

2010-02-14 17:45:59 -08:00

b43legacy

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

2010-02-14 17:45:59 -08:00

hostap

drivers/net/: use DEFINE_PCI_DEVICE_TABLE()

2010-01-07 23:54:26 -08:00

ipw2x00

drivers/net/: use DEFINE_PCI_DEVICE_TABLE()

2010-01-07 23:54:26 -08:00

iwlwifi

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

2010-02-14 22:30:54 -08:00

iwmc3200wifi

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

2010-02-14 22:30:54 -08:00

libertas

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

2010-02-14 17:45:59 -08:00

libertas_tf

Add Station and AdHoc mode support to libertas_tf

2010-02-10 16:36:50 -05:00

orinoco

net: use netdev_mc_count and netdev_mc_empty when appropriate

2010-02-12 11:38:58 -08:00

p54

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

2010-02-14 17:45:59 -08:00

prism54

drivers/net/: use DEFINE_PCI_DEVICE_TABLE()

2010-01-07 23:54:26 -08:00

rt2x00

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

2010-02-14 17:45:59 -08:00

rtl818x

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

2010-02-14 22:30:54 -08:00

wl12xx

wl1251: fix txop unit

2010-02-08 16:50:56 -05:00

zd1211rw

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

2010-01-23 00:31:06 -08:00

adm8211.c

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

2010-02-14 17:45:59 -08:00

adm8211.h

mac80211: fix ADM8211_SYNCTL_RFtype define

2009-10-07 16:33:51 -04:00

airo_cs.c

pcmcia: rework the irq_req_t typedef

2009-11-28 18:03:14 +01:00

airo.c

net: use netdev_mc_count and netdev_mc_empty when appropriate

2010-02-12 11:38:58 -08:00

airo.h

…

at76c50x-usb.c

mac80211: remove struct ieee80211_if_init_conf

2009-12-28 16:55:07 -05:00

at76c50x-usb.h

at76c50x-usb: add driver

2009-02-27 14:52:44 -05:00

atmel_cs.c

pcmcia: rework the irq_req_t typedef

2009-11-28 18:03:14 +01:00

atmel_pci.c

drivers/net/: use DEFINE_PCI_DEVICE_TABLE()

2010-01-07 23:54:26 -08:00

atmel.c

atmel: declare MODULE_FIRMWARE

2009-11-11 15:23:49 -05:00

atmel.h

…

Kconfig

wireless: airo_cs needs WEXT_SPY

2009-10-30 16:50:38 -04:00

mac80211_hwsim.c

mac80211_hwsim: add fake hw scan handler

2010-02-08 16:50:52 -05:00

Makefile

netwave: move driver to staging

2009-10-30 16:50:34 -04:00

mwl8k.c

mwl8k: remove get_tx_stats() mac80211 op

2010-02-08 16:50:59 -05:00

ray_cs.c

net: use netdev_mc_count and netdev_mc_empty when appropriate

2010-02-12 11:38:58 -08:00

ray_cs.h

…

rayctl.h

…

rndis_wlan.c

net: use netdev_mc_count and netdev_mc_empty when appropriate

2010-02-12 11:38:58 -08:00

wl3501_cs.c

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

2009-12-05 15:22:26 -08:00

wl3501.h

wl3501: convert to internal net_device_stats

2009-03-21 22:51:19 -07:00

zd1201.c

net: use netdev_mc_count and netdev_mc_empty when appropriate

2010-02-12 11:38:58 -08:00

zd1201.h

zd1201: convert to internal net_device_stats

2009-03-21 22:51:20 -07:00