Learn more about cloning repositories
You have read-only access
Merge branch 'master' into for-davem Conflicts: drivers/net/wireless/iwlwifi/iwl-testmode.c net/wireless/nl80211.c