Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
authorJeff Garzik <jeff@garzik.org>
Sat, 20 May 2006 04:16:17 +0000 (00:16 -0400)
committerJeff Garzik <jeff@garzik.org>
Sat, 20 May 2006 04:16:17 +0000 (00:16 -0400)

Trivial merge