Merge tag 'for-linville-20131001' of git://github.com/kvalo/ath
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 3 Oct 2013 20:16:34 +0000 (16:16 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 3 Oct 2013 20:16:34 +0000 (16:16 -0400)

Trivial merge