Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
authorJeff Garzik <jgarzik@pobox.com>
Fri, 17 Feb 2006 21:10:20 +0000 (16:10 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 17 Feb 2006 21:10:20 +0000 (16:10 -0500)

Trivial merge