Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git