kernel-fxtec-pro1x/drivers/net/wireless/iwlwifi
David S. Miller 730c30ec64 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:

	drivers/net/wireless/iwlwifi/iwl-core.c
	drivers/net/wireless/iwlwifi/iwl-sta.c
2008-12-05 22:54:40 -08:00
..
iwl-3945-commands.h iwlwifi: store ucode version number 2008-12-05 09:35:55 -05:00
iwl-3945-core.h iwlwifi: rely on API version read from firmware 2008-12-05 09:35:56 -05:00
iwl-3945-debug.h
iwl-3945-hw.h
iwl-3945-io.h iwlwifi : fix checkpatch.pl errors 2008-11-25 16:41:18 -05:00
iwl-3945-led.c
iwl-3945-led.h
iwl-3945-rs.c iwl3945: Fix iwl3945 rate scaling. 2008-12-05 09:35:55 -05:00
iwl-3945-rs.h
iwl-3945.c iwlwifi: rely on API version read from firmware 2008-12-05 09:35:56 -05:00
iwl-3945.h iwl3945 : Fix a-band association for passive channels 2008-12-05 09:35:56 -05:00
iwl-4965-hw.h iwlwifi: revamp tx scheduler byte count tables handling 2008-11-21 11:07:23 -05:00
iwl-4965.c iwlwifi: rely on API version read from firmware 2008-12-05 09:35:56 -05:00
iwl-5000-hw.h iwlwifi: revamp tx scheduler byte count tables handling 2008-11-21 11:07:23 -05:00
iwl-5000.c iwlwifi: rely on API version read from firmware 2008-12-05 09:35:56 -05:00
iwl-agn-hcmd-check.c iwlwifi: move host command check function into separate file 2008-12-05 09:35:51 -05:00
iwl-agn-rs.c iwlwifi : fix checkpatch.pl errors 2008-11-25 16:41:18 -05:00
iwl-agn-rs.h iwlwifi: trivial removal of some 4965 remaining from iwl-agn-rs.h 2008-11-10 15:17:36 -05:00
iwl-agn.c iwlwifi: rely on API version read from firmware 2008-12-05 09:35:56 -05:00
iwl-calib.c
iwl-calib.h
iwl-commands.h iwlwifi: store ucode version number 2008-12-05 09:35:55 -05:00
iwl-core.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2008-12-05 22:54:40 -08:00
iwl-core.h iwlwifi: rely on API version read from firmware 2008-12-05 09:35:56 -05:00
iwl-csr.h iwlwifi: protect headers from double inclusion 2008-10-31 19:00:36 -04:00
iwl-debug.h iwlwifi: move channels sysfs to debugfs 2008-12-05 09:35:54 -05:00
iwl-debugfs.c iwlwifi: move channels sysfs to debugfs 2008-12-05 09:35:54 -05:00
iwl-dev.h iwlwifi: store ucode version number 2008-12-05 09:35:55 -05:00
iwl-eeprom.c iwlwifi: run through spell checker 2008-10-31 19:02:28 -04:00
iwl-eeprom.h iwlwifi: 5150 compute ct kill threshold 2008-12-05 09:35:49 -05:00
iwl-fh.h iwlwifi: TX update chicken bits 2008-11-26 09:47:39 -05:00
iwl-hcmd.c iwlwifi : fix checkpatch.pl errors 2008-11-25 16:41:18 -05:00
iwl-helpers.h iwlwifi: refactor tx byte count table usage 2008-10-31 19:02:27 -04:00
iwl-io.h iwlwifi : fix checkpatch.pl errors 2008-11-25 16:41:18 -05:00
iwl-led.c iwlwifi: run through spell checker 2008-10-31 19:02:28 -04:00
iwl-led.h
iwl-power.c iwlwifi: don't fail power set when calibration is not done yet 2008-11-21 11:06:07 -05:00
iwl-power.h
iwl-prph.h iwlwifi: run through spell checker 2008-10-31 19:02:28 -04:00
iwl-rfkill.c iwlwifi: run through spell checker 2008-10-31 19:02:28 -04:00
iwl-rfkill.h
iwl-rx.c iwlwifi: consolidate station management code 2008-11-25 16:41:06 -05:00
iwl-scan.c iwlwifi: remove implicit direct scan 2008-11-10 15:10:17 -05:00
iwl-spectrum.c iwlwifi: move spectrum measurement code to iwl-spectrum.c file 2008-11-21 11:07:23 -05:00
iwl-spectrum.h iwlwifi: move spectrum measurement code to iwl-spectrum.c file 2008-11-21 11:07:23 -05:00
iwl-sta.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2008-12-05 22:54:40 -08:00
iwl-sta.h iwlwifi: move iwl_clear_stations_table to iwl-sta.c 2008-11-26 09:47:37 -05:00
iwl-tx.c iwlwifi: fix DMA channel number in iwl_txq_ctx_stop 2008-12-05 09:35:55 -05:00
iwl3945-base.c iwl3945 : Fix a-band association for passive channels 2008-12-05 09:35:56 -05:00
Kconfig wireless: consolidate on a single escape_essid implementation 2008-10-31 19:00:46 -04:00
Makefile iwlwifi: move host command check function into separate file 2008-12-05 09:35:51 -05:00