Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
authorJeff Garzik <jeff@garzik.org>
Thu, 3 Aug 2006 21:19:44 +0000 (17:19 -0400)
committerJeff Garzik <jeff@garzik.org>
Thu, 3 Aug 2006 21:19:44 +0000 (17:19 -0400)

Trivial merge