Merge branch 'for-linville' of git://github.com/kvalo/ath
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 30 May 2014 17:43:31 +0000 (13:43 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 30 May 2014 17:43:31 +0000 (13:43 -0400)

Trivial merge