Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
authorJeff Garzik <jeff@garzik.org>
Fri, 10 Nov 2006 16:10:51 +0000 (11:10 -0500)
committerJeff Garzik <jeff@garzik.org>
Fri, 10 Nov 2006 16:10:51 +0000 (11:10 -0500)

Trivial merge