Merge tag 'for-linville-20130730' of git://github.com/kvalo/ath6kl