Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
authorJeff Garzik <jeff@garzik.org>
Thu, 24 May 2007 21:17:11 +0000 (17:17 -0400)
committerJeff Garzik <jeff@garzik.org>
Thu, 24 May 2007 21:17:11 +0000 (17:17 -0400)

Trivial merge