Reinette Chatre df29ff3794 iwlwifi: fix merge error ... This hunk of code was removed in patch "iwlwifi: do not cancel delayed work inside spin_lock_irqsave" submitted at http://marc.info/?l=linux-wireless&m=124267503030042&w=2 This same patch in this repo does not remove this hunk. Remove it here. Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>		2009-06-03 14:05:09 -04:00
..
iwl3945-base.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-05-25 01:42:21 -07:00
iwl-1000.c
iwl-3945-fh.h
iwl-3945-hw.h	iwl3945: set TFD_QUEUE_MAX to correct value	2009-03-27 20:12:58 -04:00
iwl-3945-led.c	iwl3945: improve 3945 leds	2009-05-22 14:06:02 -04:00
iwl-3945-led.h
iwl-3945-rs.c	iwlwifi: Fix handling of retry count of NO_ACK frames in iwl-{3945|agn}-rs	2009-05-06 15:14:51 -04:00
iwl-3945.c	iwlcore: support ICT interrupt	2009-05-22 14:06:05 -04:00
iwl-3945.h	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6	2009-04-25 16:36:46 -07:00
iwl-4965-hw.h
iwl-4965.c	iwlcore: support ICT interrupt	2009-05-22 14:06:05 -04:00
iwl-5000-hw.h	iwlwifi: Temperature sensor voltage reading for 5150	2009-05-22 14:06:03 -04:00
iwl-5000.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-05-25 01:42:21 -07:00
iwl-6000-hw.h
iwl-6000.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-05-18 21:08:20 -07:00
iwl-agn-rs.c	iwlwifi: report the rate index as an MCS rate number	2009-05-22 14:06:05 -04:00
iwl-agn-rs.h	iwlagn: improve rate scale table search	2009-05-11 15:24:01 -04:00
iwl-agn.c	iwlagn: co-exist with AMT	2009-05-22 14:06:09 -04:00
iwl-calib.c	iwlwifi: clean up PS code	2009-05-11 15:23:59 -04:00
iwl-calib.h
iwl-commands.h	iwlwifi: support "pure 40MHz" in RXON command	2009-05-22 14:06:05 -04:00
iwl-core.c	iwlwifi: fix merge error	2009-06-03 14:05:09 -04:00
iwl-core.h	iwlcore: Allow skb allocation from tasklet.	2009-05-22 14:06:08 -04:00
iwl-csr.h	iwlagn: co-exist with AMT	2009-05-22 14:06:09 -04:00
iwl-debug.h	iwlwifi: support NVM access (EEPROM/OTP)	2009-05-22 14:06:04 -04:00
iwl-debugfs.c	iwlwifi: check for valid band for channel info	2009-05-22 14:06:09 -04:00
iwl-dev.h	iwlagn: co-exist with AMT	2009-05-22 14:06:09 -04:00
iwl-eeprom.c	iwlcore: register locks	2009-05-22 14:06:04 -04:00
iwl-eeprom.h	iwlwifi: support NVM access (EEPROM/OTP)	2009-05-22 14:06:04 -04:00
iwl-fh.h
iwl-hcmd.c
iwl-helpers.h	mac80211/iwlwifi: move virtual A-MDPU queue bookkeeping to iwlwifi	2009-03-27 20:13:23 -04:00
iwl-io.h	iwlcore: register locks	2009-05-22 14:06:04 -04:00
iwl-led.c
iwl-led.h
iwl-power.c	iwlwifi: clean up PS code	2009-05-11 15:23:59 -04:00
iwl-power.h	iwlwifi: clean up PS code	2009-05-11 15:23:59 -04:00
iwl-prph.h
iwl-rfkill.c	rfkill: remove user_claim stuff	2009-04-22 16:54:27 -04:00
iwl-rfkill.h
iwl-rx.c	iwlcore: Set rb_timeout to 0x10 for devices with ICT	2009-05-22 14:06:09 -04:00
iwl-scan.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-05-25 01:42:21 -07:00
iwl-spectrum.c
iwl-spectrum.h
iwl-sta.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6	2009-05-08 12:46:17 -07:00
iwl-sta.h
iwl-tx.c	iwlcore: register locks	2009-05-22 14:06:04 -04:00
Kconfig
Makefile