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

Conflicts:

	drivers/net/wireless/iwlwifi/iwl-core.c
	drivers/net/wireless/iwlwifi/iwl-sta.c

2008-12-05 22:54:40 -08:00

..

ath5k

ath5k: enable combined michael mic in key cache

2008-12-05 09:32:13 -05:00

ath9k

ath9k: Use GFP_ATOMIC when allocating TX private area

2008-12-05 09:35:59 -05: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

hostap: select required crypto bits in Kconfig

2008-12-05 09:32:10 -05:00

ipw2x00

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

2008-12-05 22:54:40 -08:00

iwlwifi

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

2008-12-05 22:54:40 -08:00

libertas

wireless: clean up radiotap a bit

2008-12-05 09:32:59 -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 lm87 checksum endianness

2008-12-05 09:35:46 -05:00

prism54

net: convert print_mac to %pM

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

rt2x00

rt2x00: Correctly initialize AID during set_key()

2008-12-05 09:35:57 -05:00

rtl818x

rtl8187: fix retry count passed in rtl8187_tx

2008-12-05 09:32:59 -05:00

zd1211rw

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

2008-12-05 22:54:40 -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

tty: driverdata and discdata are void *

2008-12-05 22:32:22 -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

…