Merge branch 'for-linville' of git://github.com/kvalo/ath
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 15 Aug 2013 19:54:06 +0000 (15:54 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 15 Aug 2013 19:54:06 +0000 (15:54 -0400)

Trivial merge