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

Conflicts:

	drivers/net/wireless/rt2x00/Kconfig
	drivers/net/wireless/rt2x00/rt2x00usb.c
	net/sctp/protocol.c

2008-06-16 18:25:48 -07:00

..

ath5k

ath5k: use IEEE80211_SKB_CB

2008-06-03 15:00:16 -04:00

b43

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

2008-06-16 18:25:48 -07:00

b43legacy

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

2008-06-10 02:22:26 -07:00

hostap

net: Eliminate flush_scheduled_work() calls while RTNL is held.

2008-06-12 02:22:02 -07:00

iwlwifi

mac80211: remove ieee80211_get_morefrag

2008-06-14 12:18:12 -04:00

libertas

libertas: rename some registers to clarify their meaning

2008-06-14 12:18:04 -04:00

p54

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

2008-06-10 02:22:26 -07:00

prism54

…

rt2x00

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

2008-06-16 18:25:48 -07:00

zd1211rw

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

2008-06-10 02:22:26 -07:00

adm8211.c

…

adm8211.h

…

airo_cs.c

…

airo.c

airo: use simple_read_from_buffer()

2008-06-14 12:17:59 -04:00

airo.h

…

airport.c

…

arlan-main.c

…

arlan-proc.c

…

arlan.h

…

atmel_cs.c

…

atmel_pci.c

…

atmel.c

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

2008-06-10 02:22:26 -07:00

atmel.h

…

hermes_rid.h

…

hermes.c

…

hermes.h

…

i82586.h

…

i82593.h

…

ipw2100.c

…

ipw2100.h

…

ipw2200.c

ipw2200: queue direct scans

2008-06-09 15:50:16 -04:00

ipw2200.h

ipw2200: queue direct scans

2008-06-09 15:50:16 -04:00

Kconfig

mac80211_hwsim: 802.11 radio simulator for mac80211

2008-06-14 12:18:11 -04:00

mac80211_hwsim.c

mac80211_hwsim: Shared TX code for received frames and Beacons

2008-06-14 12:18:12 -04:00

Makefile

mac80211_hwsim: 802.11 radio simulator for mac80211

2008-06-14 12:18:11 -04:00

netwave_cs.c

…

orinoco_cs.c

…

orinoco_nortel.c

…

orinoco_pci.c

…

orinoco_pci.h

…

orinoco_plx.c

…

orinoco_tmd.c

…

orinoco.c

…

orinoco.h

…

ray_cs.c

…

ray_cs.h

…

rayctl.h

…

rndis_wlan.c

rndis_wlan: Use kernel-supplied ARRAY_SIZE() macro.

2008-06-14 12:18:11 -04:00

rtl818x.h

…

rtl8180_dev.c

…

rtl8180_grf5101.c

rtl8180: fix wrong parameter in grf5101_rf_set_channel

2008-05-28 16:43:40 -04:00

rtl8180_grf5101.h

…

rtl8180_max2820.c

rtl8180: fix wrong parameter in max2820_rf_set_channel

2008-05-28 16:43:39 -04:00

rtl8180_max2820.h

…

rtl8180_rtl8225.c

…

rtl8180_rtl8225.h

…

rtl8180_sa2400.c

rtl8180: fix wrong parameter in sa2400_rf_set_channel

2008-05-28 16:43:38 -04:00

rtl8180_sa2400.h

…

rtl8180.h

…

rtl8187_dev.c

mac80211: remove ieee80211_get_morefrag

2008-06-14 12:18:12 -04:00

rtl8187_rtl8225.c

…

rtl8187_rtl8225.h

…

rtl8187.h

…

spectrum_cs.c

…

strip.c

…

wavelan_cs.c

…

wavelan_cs.h

…

wavelan_cs.p.h

…

wavelan.c

…

wavelan.h

…

wavelan.p.h

…

wl3501_cs.c

…

wl3501.h

…

zd1201.c

…

zd1201.h

…