Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
authorJeff Garzik <jeff@garzik.org>
Fri, 17 Mar 2006 00:16:59 +0000 (19:16 -0500)
committerJeff Garzik <jeff@garzik.org>
Fri, 17 Mar 2006 00:16:59 +0000 (19:16 -0500)

Trivial merge