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
This commit is contained in:
John W. Linville 2013-12-09 15:30:27 -05:00
commit 145babc68e
18 changed files with 1413 additions and 406 deletions