tree 1399ce5ce12955c971c4727dd70bc8b4db2754f1
parent a39644b235c1a45f84d6e16603cacb93740ed2d4
parent a6127b4440d1f74f26b64006b2f50c9dc6d66efc
author Kalle Valo <kvalo@codeaurora.org> 1508162814 +0300
committer Kalle Valo <kvalo@codeaurora.org> 1508162964 +0300

Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git

Mark Brown reported that there are conflicts in iwlwifi between the two trees
so fix those now.