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