Merge branch 'for-linville' of git://github.com/kvalo/ath
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 28 Aug 2014 18:36:38 +0000 (14:36 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 28 Aug 2014 18:36:38 +0000 (14:36 -0400)

Trivial merge