Merge branch 'for-linville' of git://github.com/kvalo/ath6kl
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 6 Feb 2012 19:45:07 +0000 (14:45 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 6 Feb 2012 19:45:07 +0000 (14:45 -0500)

Trivial merge