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)

Trivial merge