John W. Linville 515db09338 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux ... Conflicts: drivers/net/wireless/iwlegacy/iwl-debugfs.c drivers/net/wireless/iwlegacy/iwl-rx.c drivers/net/wireless/iwlegacy/iwl-scan.c drivers/net/wireless/iwlegacy/iwl-tx.c include/net/bluetooth/bluetooth.h		2011-11-22 14:05:46 -05:00
..
iwl-1000.c	iwlagn: move iwl_enable_rfkill_int and kill iwl-helpers.h	2011-10-14 14:48:13 -04:00
iwl-2000.c	iwlwifi: remove un-supported SKUs	2011-11-11 12:32:53 -05:00
iwl-5000.c	iwlagn: move iwl_enable_rfkill_int and kill iwl-helpers.h	2011-10-14 14:48:13 -04:00
iwl-6000.c	iwlwifi: remove un-supported SKUs	2011-11-11 12:32:53 -05:00
iwl-agn-calib.c	iwlagn: simplify chain_noise_num_beacons indirection	2011-09-19 15:58:29 -04:00
iwl-agn-calib.h	iwlagn: remove iwlagn_hcmd_utils structure and call directly	2011-07-11 15:02:10 -04:00
iwl-agn-hw.h	iwlagn: remove 6000 hw header	2011-10-14 14:48:13 -04:00
iwl-agn-lib.c	iwlwifi: Move the core suspend function to iwl-agn-lib	2011-11-11 12:32:54 -05:00
iwl-agn-rs.c	iwlwifi: fix rate-scaling algorithm for BT combo devices	2011-11-11 12:32:56 -05:00
iwl-agn-rs.h	iwlagn: add missing include to iwl-agn-rs.h	2011-10-14 14:48:14 -04:00
iwl-agn-rx.c	iwlwifi: add debug information on queue stop / wake	2011-11-11 12:32:56 -05:00
iwl-agn-rxon.c	iwlwifi: add debug information on queue stop / wake	2011-11-11 12:32:56 -05:00
iwl-agn-sta.c	iwlwifi: move station functions to mac80211	2011-11-11 12:32:54 -05: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	iwlwifi: fix endianity issues in debug prints	2011-11-21 16:20:47 -05:00
iwl-agn-ucode.c	iwlagn: move ucode files out of the iwl_priv structure	2011-11-11 12:32:53 -05:00
iwl-agn.c	iwlwifi: move all mac80211 related functions to one place	2011-11-11 12:32:53 -05:00
iwl-agn.h	iwlwifi: Move the core suspend function to iwl-agn-lib	2011-11-11 12:32:54 -05: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: update wowlan API	2011-11-08 15:53:53 -05:00
iwl-core.c	iwlwifi: set "echo" host command length	2011-11-11 12:32:55 -05:00
iwl-core.h	iwlwifi: move hw_scan into _mac80211 file	2011-11-11 12:32:54 -05:00
iwl-csr.h	iwlwifi: HW rev for 105 and 135 series	2011-11-08 15:53:54 -05:00
iwl-debug.h	iwl-debug: Shrink object by using dev_err and deduplicating formats	2011-11-21 16:20:48 -05:00
iwl-debugfs.c	iwlagn: move nvm_device_type from iwl_priv to iwl_trans	2011-11-11 12:32:56 -05:00
iwl-dev.h	iwlagn: move nvm_device_type from iwl_priv to iwl_trans	2011-11-11 12:32:56 -05: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	iwlagn: move nvm_device_type from iwl_priv to iwl_trans	2011-11-11 12:32:56 -05:00
iwl-eeprom.h	iwlagn: use iwl_eeprom_calib_hdr structure	2011-09-19 16:10:10 -04: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	iwlagn: use direct call for led functions	2011-04-18 08:47:43 -07:00
iwl-mac80211.c	iwlagn: convert remain-on-channel duration to TU	2011-11-11 12:32:55 -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	iwlagn: move PCI power related functions to the PCI layer	2011-06-18 08:17:29 -07:00
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	iwlagn: kill hw_params.max_stations	2011-10-14 14:48:10 -04:00
iwl-sv-open.c	iwlagn: remove knowledge of ucode image location from upper layers	2011-11-11 12:32:53 -05:00
iwl-testmode.h	iwlagn: allow application own the uCode operation	2011-07-11 15:02:08 -04: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	iwlagn: move ucode_write_complete from priv to trans structure	2011-11-11 12:32:53 -05: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	iwlwifi: improve the prints in the reclaim path	2011-11-21 16:20:47 -05:00
iwl-trans.c	iwlagn: generically provide iwl_trans_send_cmd_pdu	2011-09-19 16:08:07 -04:00
iwl-trans.h	iwlagn: move nvm_device_type from iwl_priv to iwl_trans	2011-11-11 12:32:56 -05:00
Kconfig	iwlwifi: update comments on how to enable debug flag	2011-10-14 14:48:12 -04:00
Makefile	iwlwifi: move all mac80211 related functions to one place	2011-11-11 12:32:53 -05:00