Skip to content
GitLab
Commit 05e5bd0f authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge remote branch 'wireless-next/master' into ath6kl-next 

Conflicts:
	drivers/net/wireless/ath/ath6kl/cfg80211.c
parents daa16bc5 c288ec61
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