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

Conflicts:

	net/netfilter/nf_conntrack_proto_tcp.c

2008-07-14 20:23:54 -07:00

..

ath5k

ath5k: remove now unused variable declared in ath5k_tx

2008-06-27 09:31:29 -04:00

b43

b43/b43legacy: add RFKILL_STATE_HARD_BLOCKED support

2008-06-30 17:37:37 -04:00

b43legacy

b43legacy: Remove switch statement with 64-bit index

2008-07-08 14:16:04 -04:00

hostap

netdev: Move _xmit_lock and xmit_lock_owner into netdev_queue.

2008-07-08 23:13:53 -07:00

iwlwifi

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

2008-07-08 16:30:17 -07:00

libertas

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

2008-07-14 20:23:54 -07:00

p54

p54: Add quality output to iwlist and iwconfig

2008-07-02 15:48:34 -04:00

prism54

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

2008-06-28 22:57:58 -07:00

rt2x00

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

2008-07-14 20:23:54 -07:00

zd1211rw

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

2008-07-14 20:23:54 -07:00

adm8211.c

adm8211: remove unnecessary protected bit mask/check

2008-06-26 16:50:02 -04:00

adm8211.h

mac80211: move TX info into skb->cb

2008-05-21 21:48:11 -04:00

airo_cs.c

…

airo.c

wireless: Small cleanups

2008-06-27 09:09:20 -04:00

airo.h

…

airport.c

…

arlan-main.c

arlan: use netstats in net_device structure

2008-05-14 16:29:48 -04:00

arlan-proc.c

arlan: fix warning when PROC_FS=n

2008-03-24 19:25:08 -04:00

arlan.h

arlan: use netstats in net_device structure

2008-05-14 16:29:48 -04:00

atmel_cs.c

…

atmel_pci.c

…

atmel.c

wext: Emit event stream entries correctly when compat.

2008-06-16 18:50:49 -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

rtl8187: updating Kconfig to support RTL8187B

2008-07-08 14:16:07 -04:00

mac80211_hwsim.c

wireless: fix fallout from device_create removal

2008-06-26 16:49:14 -04:00

Makefile

remove the strip driver

2008-06-26 16:49:13 -04:00

netwave_cs.c

…

orinoco_cs.c

orinoco_cs: add ID for SpeedStream wireless adapters

2008-05-20 17:55:30 -04:00

orinoco_nortel.c

…

orinoco_pci.c

…

orinoco_pci.h

…

orinoco_plx.c

…

orinoco_tmd.c

…

orinoco.c

wext: Emit event stream entries correctly when compat.

2008-06-16 18:50:49 -07:00

orinoco.h

…

ray_cs.c

proc: switch /proc/driver/ray_cs/ray_cs to seq_file interface

2008-04-16 15:59:56 -04:00

ray_cs.h

…

rayctl.h

…

rndis_wlan.c

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

2008-06-28 22:57:58 -07:00

rtl818x.h

rtl8187: Change detection of RTL8187B with USB ID of 8187

2008-07-08 14:16:07 -04:00

rtl8180_dev.c

mac80211: use multi-queue master netdevice

2008-05-21 21:48:14 -04:00

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

rtl8187: Change detection of RTL8187B with USB ID of 8187

2008-07-08 14:16:07 -04:00

rtl8187_rtl8225.c

rtl8187: updating rtl8187_rtl8225.c to support RTL8187B

2008-07-08 14:16:06 -04:00

rtl8187_rtl8225.h

…

rtl8187.h

rtl8187: updating rtl8187.h to support RTL8187B

2008-07-08 14:16:06 -04:00

spectrum_cs.c

…

wavelan_cs.c

wavelan: avoid index past end of array if DEBUG_SHOW_UNUSED is defined

2008-05-12 21:18:05 -04:00

wavelan_cs.h

wavelan_cs arm fix

2008-03-24 19:25:07 -04:00

wavelan_cs.p.h

wavelan_cs: stop inlining largish static functions

2008-04-08 15:05:57 -04:00

wavelan.c

wavelan: avoid index past end of array if DEBUG_SHOW_UNUSED is defined

2008-05-12 21:18:05 -04:00

wavelan.h

…

wavelan.p.h

…

wl3501_cs.c

wext: Emit event stream entries correctly when compat.

2008-06-16 18:50:49 -07:00

wl3501.h

…

zd1201.c

wext: Emit event stream entries correctly when compat.

2008-06-16 18:50:49 -07:00

zd1201.h

…