]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git
authorKalle Valo <kvalo@codeaurora.org>
Sun, 10 Jul 2016 18:02:20 +0000 (21:02 +0300)
committerKalle Valo <kvalo@codeaurora.org>
Sun, 10 Jul 2016 18:07:29 +0000 (21:07 +0300)
commit7465e4d35ce8d590f52a4480c2abf439e5963e53
tree5b10f3cb75949f721cf3f91c2f8ddcc87c06aaae
parent5ad44bd50f341b64dbaca803ef641512ac4810fd
parent9f80f11c7e22d829f75bcd352055ab4186234715
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git

This is to fix some conflicts in iwlwifi.

Conflicts:
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
drivers/net/wireless/intel/iwlwifi/mvm/scan.c
drivers/net/wireless/ath/ath10k/core.c
drivers/net/wireless/ath/ath10k/htt_rx.c
drivers/net/wireless/ath/ath10k/mac.c
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
drivers/net/wireless/intel/iwlwifi/mvm/sta.c
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c