Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
authorJeff Garzik <jeff@garzik.org>
Tue, 26 Dec 2006 21:38:31 +0000 (16:38 -0500)
committerJeff Garzik <jeff@garzik.org>
Tue, 26 Dec 2006 21:38:31 +0000 (16:38 -0500)

Trivial merge