Merge branch 'for-linville' of git://github.com/kvalo/ath
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 14 Mar 2014 18:25:53 +0000 (14:25 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 14 Mar 2014 18:25:53 +0000 (14:25 -0400)

Trivial merge