Merge branch 'libertas' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorJeff Garzik <jeff@garzik.org>
Wed, 13 Jun 2007 02:27:30 +0000 (22:27 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 13 Jun 2007 02:27:30 +0000 (22:27 -0400)
commit12b90de64f38226e1e095c55b533f0f4d4f0f572
tree9955197d842511064a1eff6db815fe56cd8f0eb3
parent6f8a7c66e2dc8080950d28edc0259f37739aead9
parent717c9339202a42ae7bec7d3c4b84deecdcae9f81
Merge branch 'libertas' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream-fixes