Learn more about cloning repositories
You have read-only access
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.
