public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
linux/drivers/net/wireless/intel/iwlwifi/fw
History
Kalle Valo 0ddcf3e76a Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git 
To fix a conflict reported by Stephen Rothwell <sfr@canb.auug.org.au>:

Today's linux-next merge of the wireless-drivers-next tree got a
conflict in:

  drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c

between commit:

  77e30e10ee ("iwlwifi: mvm: query regdb for wmm rule if needed")

from the wireless-drivers tree and commits:

  9c4f7d5127 ("iwlwifi: move all NVM parsing code to the common files")
  4c625c564b ("iwlwifi: get rid of fw/nvm.c")

from the wireless-drivers-next tree.
2018-04-26 13:26:37 +03:00
..
api Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git 2018-04-26 13:26:37 +03:00
acpi.c iwlwifi: acpi: move code that reads SPLC to acpi 2017-10-06 15:22:33 +03:00
acpi.h iwlwifi: acpi: move code that reads SPLC to acpi 2017-10-06 15:22:33 +03:00
common_rx.c iwlwifi: implement fseq version mismatch warning 2017-08-01 12:41:45 +03:00
dbg.c iwlwifi: wrt: add fw force restart via triggers 2018-03-28 22:43:40 +03:00
dbg.h iwlwifi: move timestamp functions from debugfs.h to dbg.h 2018-04-20 10:57:16 +03:00
debugfs.c iwlwifi: move timestamp functions from debugfs.h to dbg.h 2018-04-20 10:57:16 +03:00
debugfs.h iwlwifi: move timestamp functions from debugfs.h to dbg.h 2018-04-20 10:57:16 +03:00
error-dump.h iwlwifi: dump smem configuration when firmware crashes 2017-08-09 09:35:15 +03:00
file.h iwlwifi: wrt: add fw force restart via triggers 2018-03-28 22:43:40 +03:00
img.h iwlwifi: support internal debug data collection for new devices 2017-12-20 18:28:23 +02:00
init.c iwlwifi: Cancel and set MARKER_CMD timer during suspend-resume 2018-03-02 10:19:59 +02:00
notif-wait.c iwlwifi: call iwl_remove_notification from iwl_wait_notification 2017-08-18 16:03:22 +03:00
notif-wait.h
paging.c iwlwifi: remove host assisted paging 2017-11-03 11:56:08 +02:00
runtime.h iwlwifi: get rid of fw/nvm.c 2018-04-20 10:57:16 +03:00
smem.c iwlwifi: rename the temporary name of A000 to the official 22000 2017-11-28 16:39:57 +02:00