linux-stable/drivers/net/wireless/iwlwifi
David S. Miller abb434cb05 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	net/bluetooth/l2cap_core.c

Just two overlapping changes, one added an initialization of
a local variable, and another change added a new local variable.

Signed-off-by: David S. Miller <davem@davemloft.net>
2011-12-23 17:13:56 -05:00
..
iwl-1000.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2011-12-02 15:44:03 -05:00
iwl-2000.c iwlagn: remove calibration knowledge 2011-11-28 14:44:25 -05:00
iwl-5000.c iwlwifi: move eeprom pointer from iwl_priv to iwl_shared 2011-12-08 15:55:08 -08:00
iwl-6000.c iwlwifi: move eeprom pointer from iwl_priv to iwl_shared 2011-12-08 15:55:08 -08:00
iwl-agn-calib.c iwlwifi: move calib_results list from iwl_priv to iwl_trans 2011-12-08 15:55:24 -08:00
iwl-agn-calib.h iwlwifi: move calib_results list from iwl_priv to iwl_trans 2011-12-08 15:55:24 -08:00
iwl-agn-hw.h iwlagn: remove 6000 hw header 2011-10-14 14:48:13 -04:00
iwl-agn-lib.c iwlagn: use IWL_MAX_TID_COUNT for WoWLAN 2011-12-08 15:55:46 -08:00
iwl-agn-rs.c iwlagn: use IWL_MAX_TID_COUNT instead of TID_MAX_LOAD_COUNT 2011-12-08 15:55:52 -08:00
iwl-agn-rs.h iwlagn: use IWL_MAX_TID_COUNT instead of TID_MAX_LOAD_COUNT 2011-12-08 15:55:52 -08:00
iwl-agn-rx.c iwlwifi: move device_pointers from iwl_priv to iwl_shared 2011-12-08 15:55:15 -08:00
iwl-agn-rxon.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2011-12-14 14:35:41 -05:00
iwl-agn-sta.c iwlwifi: minor cleanup 2011-12-08 15:54:07 -08:00
iwl-agn-tt.c iwlagn: remove Kelvin support 2011-09-27 14:34:08 -04:00
iwl-agn-tt.h iwlagn: clean up of transport layer 2011-09-14 13:56:37 -04:00
iwl-agn-tx.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2011-12-14 14:35:41 -05:00
iwl-agn.c iwlwifi: tx_sync only on PAN context 2011-12-14 13:56:55 -05:00
iwl-agn.h iwlwifi: move eeprom pointer from iwl_priv to iwl_shared 2011-12-08 15:55:08 -08:00
iwl-bus.h iwlagn: remove drvdata support from bus layer 2011-09-19 16:10:10 -04:00
iwl-cfg.h iwlwifi: remove un-supported SKUs 2011-11-11 12:32:53 -05:00
iwl-commands.h iwlagn: fix TID use bug 2011-12-08 15:55:35 -08:00
iwl-core.c iwlwifi: move ucode notification from iwl_priv to iwl_shared 2011-12-06 16:07:07 -05:00
iwl-core.h Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2011-12-02 15:44:03 -05:00
iwl-csr.h iwlwifi: HW rev for 105 and 135 series 2011-11-08 15:53:54 -05:00
iwl-debug.h iwlagn: make debug levels more readable 2011-12-06 16:07:05 -05:00
iwl-debugfs.c iwlwifi: move eeprom pointer from iwl_priv to iwl_shared 2011-12-08 15:55:08 -08:00
iwl-dev.h iwlwifi: move calib_results list from iwl_priv to iwl_trans 2011-12-08 15:55:24 -08:00
iwl-devtrace.c iwlagn: remove unnecessary type for tracing operations 2011-11-08 15:53:54 -05:00
iwl-devtrace.h iwlagn: remove unnecessary type for tracing operations 2011-11-08 15:53:54 -05:00
iwl-eeprom.c iwlwifi: move eeprom pointer from iwl_priv to iwl_shared 2011-12-08 15:55:08 -08:00
iwl-eeprom.h iwlwifi: move eeprom pointer from iwl_priv to iwl_shared 2011-12-08 15:55:08 -08:00
iwl-fh.h iwlagn: add missing includes 2011-08-29 15:30:28 -04:00
iwl-io.c iwlwifi: remove redundancy 2011-11-21 16:20:48 -05:00
iwl-io.h iwlagn: all function iwl-io.c receive iwl_bus 2011-08-29 15:30:29 -04:00
iwl-led.c iwlagn: eliminate bus pointer from iwl_priv structure 2011-10-14 14:48:10 -04:00
iwl-led.h
iwl-mac80211.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2011-12-14 14:35:41 -05:00
iwl-pci.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux 2011-11-22 14:05:46 -05:00
iwl-power.c iwlagn: eliminate bus pointer from iwl_priv structure 2011-10-14 14:48:10 -04:00
iwl-power.h
iwl-prph.h iwlagn: cmd_queue moves to iwl_shared 2011-08-29 15:25:31 -04:00
iwl-scan.c iwlagn: don't always split remain-on-channel 2011-11-11 12:32:55 -05:00
iwl-shared.h iwlwifi: move device_pointers from iwl_priv to iwl_shared 2011-12-08 15:55:15 -08:00
iwl-testmode.c iwlwifi: move eeprom pointer from iwl_priv to iwl_shared 2011-12-08 15:55:08 -08:00
iwl-testmode.h iwlwifi: add device ID information support by testmode 2011-12-08 15:54:40 -08:00
iwl-trans-pcie-int.h iwlwifi: improve the prints in the reclaim path 2011-11-21 16:20:47 -05:00
iwl-trans-pcie-rx.c iwlwifi: move device_pointers from iwl_priv to iwl_shared 2011-12-08 15:55:15 -08:00
iwl-trans-pcie-tx.c iwlwifi: tid_data is taken twice in iwl_trans_pcie_tx_agg_alloc 2011-11-21 16:20:48 -05:00
iwl-trans-pcie.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2011-12-23 17:13:56 -05:00
iwl-trans.c iwlagn: generically provide iwl_trans_send_cmd_pdu 2011-09-19 16:08:07 -04:00
iwl-trans.h iwlwifi: move calib_results list from iwl_priv to iwl_trans 2011-12-08 15:55:24 -08:00
iwl-ucode.c iwlwifi: move calib_results list from iwl_priv to iwl_trans 2011-12-08 15:55:24 -08:00
Kconfig iwlwifi: P2P is not enabled by default 2011-12-08 15:54:46 -08:00
Makefile iwlwifi: rename CONFIG_IWLWIFI_DEVICE_SVTOOL to CONFIG_IWLWIFI_DEVICE_TESTMODE 2011-12-08 15:54:30 -08:00