Merge branch 'for-linville' of git://github.com/kvalo/ath
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 26 Sep 2013 18:54:17 +0000 (14:54 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 26 Sep 2013 18:54:17 +0000 (14:54 -0400)

Trivial merge