Skip to content
GitLab
Commit 7eab0f64 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'master' into for-davem 

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-testmode.c
	net/wireless/nl80211.c
parents cade4555 80652480
Hide whitespace changes
Inline Side-by-side
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment