Skip to content
Commit 3b51cc99 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'master' into for-davem 

Conflicts:
	drivers/net/wireless/ath/ath9k/phy.c
	drivers/net/wireless/iwlwifi/iwl-6000.c
	drivers/net/wireless/iwlwifi/iwl-debugfs.c
parents c68ed255 67272440
Hide whitespace changes
Inline Side-by-side
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