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

Conflicts:

	drivers/net/ixgbe/ixgbe_main.c
	include/net/mac80211.h
	net/phonet/af_phonet.c

2008-11-20 16:44:00 -08:00

..

ath5k

ath5k: update keycache to support TKIP handling

2008-11-10 15:17:33 -05:00

ath9k

ath9k: Fix compilation failure when RFKILL is enabled

2008-11-11 13:06:14 -05:00

b43

b43: implement short slot and basic rate handling

2008-11-10 15:17:35 -05:00

b43legacy

b43legacy: reindent misleading statement

2008-11-10 15:17:39 -05:00

hostap

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

2008-11-18 23:38:23 -08:00

iwlwifi

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

2008-11-20 16:44:00 -08:00

libertas

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

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

libertas_tf

libertas_tf: fix skb tail pointer

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

orinoco

net: struct device - replace bus_id with dev_name(), dev_set_name()

2008-11-10 13:55:14 -08:00

p54

p54: initialize all deprecated fields

2008-11-10 15:17:39 -05:00

prism54

…

rt2x00

rt2x00: Remove debugfs CSR access wrappers

2008-11-10 15:17:35 -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

…

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

…

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

…

ipw2100.c

wireless: use individual buffers for printing ssid values

2008-10-31 19:00:50 -04:00

ipw2100.h

…

ipw2200.c

wireless: avoid some net/ieee80211.h vs. linux/ieee80211.h conflicts

2008-10-31 19:00:50 -04:00

ipw2200.h

wireless: consolidate on a single escape_essid implementation

2008-10-31 19:00:46 -04:00

Kconfig

wireless: consolidate on a single escape_essid implementation

2008-10-31 19:00:46 -04:00

mac80211_hwsim.c

mac80211_hwsim: Add support for client PS mode

2008-11-10 15:17:41 -05:00

Makefile

orinoco: Move sources to a subdirectory

2008-11-10 15:17:42 -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

rtl818x.h

…

rtl8180_dev.c

…

rtl8180_grf5101.c

…

rtl8180_grf5101.h

…

rtl8180_max2820.c

…

rtl8180_max2820.h

…

rtl8180_rtl8225.c

…

rtl8180_rtl8225.h

…

rtl8180_sa2400.c

…

rtl8180_sa2400.h

…

rtl8180.h

…

rtl8187_dev.c

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

2008-11-18 23:38:23 -08:00

rtl8187_rtl8225.c

rtl8187: Change TX power settings

2008-11-10 15:17:42 -05:00

rtl8187_rtl8225.h

…

rtl8187.h

…

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

…

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

don't use net/ieee80211.h

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

zd1201.h

…