Merge branch 'for-linville' of git://github.com/kvalo/ath6kl
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 13 Jun 2013 17:33:39 +0000 (13:33 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 13 Jun 2013 17:33:39 +0000 (13:33 -0400)

Trivial merge