Merge tag 'for-linville-20130730' of git://github.com/kvalo/ath6kl
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 2 Aug 2013 19:40:11 +0000 (15:40 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 2 Aug 2013 19:40:11 +0000 (15:40 -0400)

Trivial merge