linux/drivers/net/wireless/intel/iwlwifi
David S. Miller 89b1698c93 Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
The BTF conflicts were simple overlapping changes.

The virtio_net conflict was an overlap of a fix of statistics counter,
happening alongisde a move over to a bonafide statistics structure
rather than counting value on the stack.

Signed-off-by: David S. Miller <davem@davemloft.net>
2018-08-02 10:55:32 -07:00
..
cfg iwlwifi: add more card IDs for 9000 series 2018-07-25 10:29:29 +03:00
dvm iwlwifi: remove upper case letters in sku_capa_band_*_enable 2018-04-20 10:57:16 +03:00
fw iwlwifi: mvm: drop UNKNOWN security type frames 2018-05-30 09:08:06 +03:00
mvm wireless-drivers: use BIT_ULL for NL80211_STA_INFO_ attribute types 2018-06-27 19:07:39 +03:00
pcie iwlwifi: add more card IDs for 9000 series 2018-07-25 10:29:29 +03:00
iwl-agn-hw.h
iwl-config.h iwlwifi: add more card IDs for 9000 series 2018-07-25 10:29:29 +03:00
iwl-context-info.h
iwl-csr.h iwlwifi: allow different csr flags for different device families 2018-04-26 15:18:07 +03:00
iwl-debug.c
iwl-debug.h iwlwifi: acpi: add common code to read from ACPI 2017-10-06 15:22:28 +03:00
iwl-devtrace-data.h
iwl-devtrace-io.h iwlwifi: pcie: add MSI-X interrupt tracing 2017-06-29 20:27:48 +03:00
iwl-devtrace-iwlwifi.h net/wireless/iwlwifi: fix iwlwifi_dev_ucode_error tracepoint 2018-03-28 22:55:19 +02:00
iwl-devtrace-msg.h
iwl-devtrace-ucode.h
iwl-devtrace.c net/wireless/iwlwifi: fix iwlwifi_dev_ucode_error tracepoint 2018-03-28 22:55:19 +02:00
iwl-devtrace.h iwlwifi: fix tracing when tx only is enabled 2017-07-21 12:26:38 +03:00
iwl-drv.c iwlwifi: pcie: remove non-responsive device 2018-04-26 15:18:07 +03:00
iwl-drv.h
iwl-eeprom-parse.c iwlwifi: remove upper case letters in sku_capa_band_*_enable 2018-04-20 10:57:16 +03:00
iwl-eeprom-parse.h iwlwifi: remove upper case letters in sku_capa_band_*_enable 2018-04-20 10:57:16 +03:00
iwl-eeprom-read.c iwlwifi: allow different csr flags for different device families 2018-04-26 15:18:07 +03:00
iwl-eeprom-read.h
iwl-fh.h iwlwifi: rename the temporary name of A000 to the official 22000 2017-11-28 16:39:57 +02:00
iwl-io.c iwlwifi: fix nmi triggering from host 2017-08-09 21:14:43 +03:00
iwl-io.h
iwl-modparams.h iwlwifi: pcie: remove non-responsive device 2018-04-26 15:18:07 +03:00
iwl-nvm-parse.c iwlwifi: mvm: remove division by size of sizeof(struct ieee80211_wmm_rule) 2018-05-30 09:49:38 +03:00
iwl-nvm-parse.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git 2018-04-26 13:26:37 +03:00
iwl-op-mode.h
iwl-phy-db.c iwlwifi: mvm: add documentation for all command IDs 2017-06-29 13:26:24 +03:00
iwl-phy-db.h
iwl-prph.h iwlwifi: fix nmi triggering from host 2017-08-09 21:14:43 +03:00
iwl-scd.h
iwl-trans.c iwlwifi: trans: move ref/unref code to the common part of the transport 2017-10-06 14:57:20 +03:00
iwl-trans.h iwlwifi: introduce Image Loader (IML) - new firmware image 2018-04-26 15:18:07 +03:00
Kconfig iwlwifi: fix malformed CONFIG_IWLWIFI_PCIE_RTPM default 2018-03-02 10:20:03 +02:00
Makefile iwlwifi: get rid of fw/nvm.c 2018-04-20 10:57:16 +03:00