Merge branch 'for-linville' of git://github.com/kvalo/ath6kl
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 3 Oct 2011 18:59:35 +0000 (14:59 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 3 Oct 2011 18:59:35 +0000 (14:59 -0400)

Trivial merge