Skip to content
Snippets Groups Projects
Commit 490f0dc4 authored by John W. Linville's avatar John W. Linville
Browse files

Merge tag 'for-linville-20141024' of git://github.com/kvalo/ath 

Conflicts:
	drivers/net/wireless/ath/wil6210/wil6210.h
parents 61ed53de 84cbf3a7
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 2240 additions and 1345 deletions
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