Reinette Chatre ad41ee3a45 Merge branch 'wireless-2.6' into wireless-next-2.6 ... Patch "iwlwifi: work around passive scan issue" was merged into wireless-2.6, but touched a lot of code since modified (and moved) in wireless-next-2.6. This caused some conflicts. Conflicts: drivers/net/wireless/iwlwifi/iwl-scan.c Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>		2010-04-30 15:13:00 -07: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 'wireless-2.6' into wireless-next-2.6	2010-04-30 15:13:00 -07:00
p54pci.h	p54pci: move tx cleanup into tasklet	2010-01-19 16:43:12 -05:00
p54spi_eeprom.h
p54spi.c
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	p54: remove usage of deprecated noise value	2010-04-28 16:48:22 -04:00