Skip to content
Commit 145babc6 authored by John W. Linville's avatar John W. Linville
Browse files

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

Conflicts:
	drivers/net/wireless/ath/ath10k/htc.c
	drivers/net/wireless/ath/ath10k/mac.c
parents e08fd975 cfb27d29
Expand all Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment