Merge branch 'for-linville-ath10k' of git://github.com/kvalo/ath6kl