Merge branch 'for-linville' of git://github.com/kvalo/ath6kl
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 17 Nov 2011 20:16:55 +0000 (15:16 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 17 Nov 2011 20:16:55 +0000 (15:16 -0500)

Trivial merge