Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
authorJeff Garzik <jeff@garzik.org>
Thu, 30 Nov 2006 11:01:04 +0000 (06:01 -0500)
committerJeff Garzik <jeff@garzik.org>
Thu, 30 Nov 2006 11:01:04 +0000 (06:01 -0500)

Trivial merge