Merge branch 'for-linville-ath10k' of git://github.com/kvalo/ath6kl
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 13 Jun 2013 17:34:29 +0000 (13:34 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 13 Jun 2013 17:54:21 +0000 (13:54 -0400)

Trivial merge