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

Conflicts:
	drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
	net/llc/af_llc.c

2010-12-08 13:47:38 -08:00

..

ath

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

2010-12-08 13:47:38 -08:00

b43

b43: N-PHY: little cleanups

2010-11-24 16:19:34 -05:00

b43legacy

drivers/net/wireless/b43legacy/main.c: Use printf extension %pV

2010-11-16 16:37:05 -05:00

hostap

…

ipw2x00

…

iwlwifi

iwlwifi: advance power management support

2010-11-24 16:19:37 -05:00

iwmc3200wifi

iwmc3200wifi: clarify potentially undefined operation in iwm_scan_ssids

2010-11-18 14:22:21 -05:00

libertas

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

2010-12-08 13:47:38 -08:00

libertas_tf

…

orinoco

orinoco: abort scan on interface down

2010-11-30 13:23:05 -05:00

p54

…

prism54

…

rt2x00

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

2010-11-24 16:49:20 -05:00

rtl818x

rtl8187: restore anaparam registers after reset with 8187B

2010-11-15 13:25:48 -05:00

wl12xx

wl12xx: Unset bssid filter, ssid and bssid from firmware on disassoc

2010-11-22 16:45:14 +02:00

wl1251

wl1251: use wl12xx_platform_data to pass data

2010-11-15 13:27:02 -05:00

zd1211rw

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

2010-11-29 11:19:09 -08:00

adm8211.c

…

adm8211.h

…

airo_cs.c

…

airo.c

…

airo.h

…

at76c50x-usb.c

…

at76c50x-usb.h

…

atmel_cs.c

…

atmel_pci.c

…

atmel.c

atmel: Use static const

2010-11-22 15:58:46 -05:00

atmel.h

…

Kconfig

…

mac80211_hwsim.c

mac80211_hwsim: Incorporate txpower into rssi

2010-11-15 13:25:28 -05:00

Makefile

…

mwl8k.c

mwl8k: use const struct fw pointers throughout

2010-11-16 16:37:03 -05:00

ray_cs.c

ray_cs: Use static const

2010-11-22 15:58:51 -05:00

ray_cs.h

…

rayctl.h

…

rndis_wlan.c

rndis_wlan: Use static const

2010-11-22 15:58:52 -05:00

wl3501_cs.c

…

wl3501.h

…

zd1201.c

zd1201: Add missing id

2010-11-15 13:25:51 -05:00

zd1201.h

…