projects / linux-block.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2c1dca3 e9bf53a)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git
authorKalle Valo <kvalo@codeaurora.org>
Thu, 24 Aug 2017 11:29:12 +0000 (14:29 +0300)
committerKalle Valo <kvalo@codeaurora.org>
Thu, 24 Aug 2017 11:47:42 +0000 (14:47 +0300)
commit5307eca1362492ce28f1572b430997d9053c021d
tree83402432406875153d24aa6434437b6cbfccc2f8tree | snapshot
parent2c1dca3c6b222a389c5dfebfcdd6fe3c87e5aa75commit | diff
parente9bf53ab1ee34bb05c104bbfd2b77c844773f8e6commit | diff
Merge git://git./linux/kernel/git/kvalo/wireless-drivers.git

Stephen Rothwell reported quite a few conflicts in iwlwifi between
wireless-drivers and wireless-drivers-next. To avoid any problems later in
other trees merge w-d to w-d-next to fix those conflicts early.
drivers/net/wireless/intel/iwlwifi/fw/file.h diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/iwl-config.h diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/iwl-drv.c diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/mvm/fw.c diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/mvm/rs.c diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/mvm/sta.c diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/mvm/tx.c diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/pcie/drv.c diff1 | diff2 | blob | history
Linux 6.x block layer and io_uring tree(s)