-
git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git由 Kalle Valo 提交于
Mark Brown reported that there are conflicts in iwlwifi between the two trees so fix those now.
0fac9e2d
Mark Brown reported that there are conflicts in iwlwifi between the two trees so fix those now.