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)
commit392e741939ddb7dd7adf7e4ec414b2140fb3a15b
tree53ad4d70d670b78b5e0cd92a3be3367f5312e697
parent53dd4b9329e4100405dc1cf251e6713b60051579
parent197035737e96a517eed26e8f4bb941738249783e
Merge branch 'ath6kl-next' of /linux/kernel/git/kvalo/ath6kl