tree 9955197d842511064a1eff6db815fe56cd8f0eb3
parent 6f8a7c66e2dc8080950d28edc0259f37739aead9
parent 717c9339202a42ae7bec7d3c4b84deecdcae9f81
author Jeff Garzik <jeff@garzik.org> 1181701650 -0400
committer Jeff Garzik <jeff@garzik.org> 1181701650 -0400

Merge branch 'libertas' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes