Merge branch 'for-linville' of git://github.com/kvalo/ath
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 1 Dec 2014 20:51:31 +0000 (15:51 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 1 Dec 2014 20:51:31 +0000 (15:51 -0500)

Trivial merge