Merge branch 'for-linville' of git://github.com/kvalo/ath
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 13 Jan 2014 19:40:03 +0000 (14:40 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 13 Jan 2014 19:40:03 +0000 (14:40 -0500)

Trivial merge