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.
Please register or sign in to comment
Mark Brown reported that there are conflicts in iwlwifi between the two trees so fix those now.