Merge branch 'libertas-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
authorJeff Garzik <jeff@garzik.org>
Wed, 13 Jun 2007 02:27:52 +0000 (22:27 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 13 Jun 2007 02:27:52 +0000 (22:27 -0400)
commitbca1a5518cab2d58c766863c61ee4ef5f1cc4caa
tree0f7922ed840c7d778ceb63b63d40d282ccfa0fcc
parent12b90de64f38226e1e095c55b533f0f4d4f0f572
parent82fde74b94f11eee1e9c30e43fb162f80a5e63c0
Merge branch 'libertas-fixes' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream-fixes