Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
authorJeff Garzik <jgarzik@pobox.com>
Tue, 31 Jan 2006 16:50:11 +0000 (11:50 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 31 Jan 2006 16:50:11 +0000 (11:50 -0500)

Trivial merge