Merge branch 'for-linville' of git://github.com/kvalo/ath6kl
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 12 Apr 2012 19:02:19 +0000 (15:02 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 12 Apr 2012 19:02:19 +0000 (15:02 -0400)

Trivial merge