Merge branch 'for-linville' of git://github.com/kvalo/ath
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 18 Oct 2013 17:57:09 +0000 (13:57 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 18 Oct 2013 17:57:09 +0000 (13:57 -0400)

Trivial merge