Merge branch 'ath6kl-next' of master.kernel.org:/pub/scm/linux/kernel/git/kvalo/ath6kl
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 9 Aug 2011 20:02:26 +0000 (16:02 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 9 Aug 2011 20:02:26 +0000 (16:02 -0400)

Trivial merge