Merge branch 'for-linville' of git://github.com/kvalo/ath
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 22 Apr 2014 19:02:03 +0000 (15:02 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 22 Apr 2014 19:02:03 +0000 (15:02 -0400)

Trivial merge