Merge tag 'for-linville-20140717' of git://github.com/kvalo/ath
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 18 Jul 2014 17:44:50 +0000 (13:44 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 18 Jul 2014 17:44:50 +0000 (13:44 -0400)

Trivial merge