Merge branch 'for-linville' of git://github.com/kvalo/ath6kl
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 20 Jun 2012 18:35:31 +0000 (14:35 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 20 Jun 2012 18:35:31 +0000 (14:35 -0400)

Trivial merge