John W. Linville 0f2df9eac7 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into merge ... Conflicts: Documentation/feature-removal-schedule.txt drivers/net/wireless/ath/ath5k/phy.c drivers/net/wireless/iwlwifi/iwl-4965.c drivers/net/wireless/iwlwifi/iwl-agn.c drivers/net/wireless/iwlwifi/iwl-core.c drivers/net/wireless/iwlwifi/iwl-core.h drivers/net/wireless/iwlwifi/iwl-tx.c		2010-04-08 13:34:54 -04:00
..
eeprom.c	p54: disable channels with incomplete calibration data sets	2009-11-02 15:43:23 -05:00
eeprom.h
fwio.c
Kconfig	wireless: remove WLAN_80211 and WLAN_PRE80211 from Kconfig	2009-10-30 16:50:35 -04:00
led.c
lmac.h
main.c	p54: Enable HW_REPORTS_TX_ACK_STATUS	2010-03-09 15:02:56 -05:00
Makefile
net2280.h
p54.h	p54: remove get_tx_stats() mac80211 op	2010-02-08 16:51:01 -05:00
p54pci.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6	2010-02-04 08:58:14 -08:00
p54pci.h	p54pci: move tx cleanup into tasklet	2010-01-19 16:43:12 -05:00
p54spi_eeprom.h
p54spi.c	spi: prefix modalias with "spi:"	2009-09-23 07:39:43 -07:00
p54spi.h
p54usb.c	Add USB ID for Thomson SpeedTouch 120g to p54usb id table	2010-03-30 15:37:26 -04:00
p54usb.h
txrx.c	wireless/prism54: remove trailing space in messages	2010-03-31 14:39:07 -04:00