Merge branch 'libertas-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
authorJeff Garzik <jeff@garzik.org>
Mon, 2 Jul 2007 12:14:30 +0000 (08:14 -0400)
committerJeff Garzik <jeff@garzik.org>
Mon, 2 Jul 2007 12:14:30 +0000 (08:14 -0400)

Trivial merge