Merge branch 'for-linville' of git://github.com/kvalo/ath6kl
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 19 Dec 2011 19:25:17 +0000 (14:25 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 19 Dec 2011 19:25:17 +0000 (14:25 -0500)

Trivial merge