Merge tag 'for-linville-20140725' of git://github.com/kvalo/ath
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 29 Jul 2014 14:32:12 +0000 (10:32 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 29 Jul 2014 14:32:12 +0000 (10:32 -0400)

Trivial merge