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

Conflicts:

	drivers/net/hp-plus.c
	drivers/net/wireless/ath5k/base.c
	drivers/net/wireless/ath9k/recv.c
	net/wireless/reg.c

2008-11-26 23:48:40 -08:00

..

ath5k

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

2008-11-26 23:48:40 -08:00

ath9k

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

2008-11-26 23:48:40 -08:00

b43

b43: remove rate index warning

2008-11-21 11:06:07 -05:00

b43legacy

b43legacy: implement short slot and basic rate handling

2008-11-21 11:06:06 -05:00

hostap

lib80211: consolidate crypt init routines

2008-11-21 11:08:17 -05:00

ipw2x00

net/ieee80211 -> drivers/net/ipw2x00/libipw_* rename

2008-11-21 11:08:18 -05:00

iwlwifi

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

2008-11-26 23:48:40 -08:00

libertas

libertas: Fine grained configuration of wake-on-lan.

2008-11-21 11:06:03 -05:00

libertas_tf

libertas_tf: fix skb tail pointer

2008-11-18 17:26:26 -05:00

orinoco

orinoco: Provide option to avoid unnecessary fw caching

2008-11-26 09:47:47 -05:00

p54

p54: fix wmm queue settings

2008-11-26 09:47:50 -05:00

prism54

net: convert print_mac to %pM

2008-10-27 17:06:18 -07:00

rt2x00

rt2x00: Don't switch off LED on initialization

2008-11-26 09:47:19 -05:00

rtl818x

rtl8187: Fix transmission count sent to mac80211

2008-11-26 09:47:20 -05:00

zd1211rw

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

2008-11-06 22:43:03 -08:00

adm8211.c

adm8211: remove SSID code

2008-11-10 15:11:56 -05:00

adm8211.h

adm8211: remove SSID code

2008-11-10 15:11:56 -05:00

airo_cs.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

2008-10-13 14:12:40 -07:00

airo.c

don't use net/ieee80211.h

2008-11-10 15:11:56 -05:00

airo.h

…

arlan-main.c

drivers/net: Kill now superfluous ->last_rx stores.

2008-11-03 21:11:17 -08:00

arlan-proc.c

…

arlan.h

…

atmel_cs.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

2008-10-13 14:12:40 -07:00

atmel_pci.c

…

atmel.c

don't use net/ieee80211.h

2008-11-10 15:11:56 -05:00

atmel.h

…

i82586.h

…

i82593.h

…

Kconfig

orinoco: Provide option to avoid unnecessary fw caching

2008-11-26 09:47:47 -05:00

mac80211_hwsim.c

mac80211_hwsim: fix-up some print_mac merge damage

2008-11-26 09:47:52 -05:00

Makefile

ipw2x00: relocate ipw2100/ipw2200 to common directory

2008-11-21 11:08:17 -05:00

netwave_cs.c

drivers/net: Kill now superfluous ->last_rx stores.

2008-11-03 21:11:17 -08:00

ray_cs.c

drivers/net: Kill now superfluous ->last_rx stores.

2008-11-03 21:11:17 -08:00

ray_cs.h

…

rayctl.h

…

rndis_wlan.c

netdevice: safe convert to netdev_priv() #part-4

2008-11-12 23:39:10 -08:00

strip.c

drivers/net: Kill now superfluous ->last_rx stores.

2008-11-03 21:11:17 -08:00

wavelan_cs.c

drivers/net: Kill now superfluous ->last_rx stores.

2008-11-03 21:11:17 -08:00

wavelan_cs.h

…

wavelan_cs.p.h

…

wavelan.c

netdevice: safe convert to netdev_priv() #part-4

2008-11-12 23:39:10 -08:00

wavelan.h

…

wavelan.p.h

net: Rationalise email address: Network Specific Parts

2008-10-13 19:01:08 -07:00

wl3501_cs.c

drivers/net: Kill now superfluous ->last_rx stores.

2008-11-03 21:11:17 -08:00

wl3501.h

don't use net/ieee80211.h

2008-11-10 15:11:56 -05:00

zd1201.c

netdevice zd1201: Convert directly reference of netdev->priv to netdev_priv()

2008-11-21 11:06:02 -05:00

zd1201.h

…