Merge branch 'for-linville-current' of git://github.com/kvalo/ath
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 29 Jul 2013 18:40:16 +0000 (14:40 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 29 Jul 2013 18:40:16 +0000 (14:40 -0400)

Trivial merge