Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
Jeff Garzik [Mon, 6 Nov 2006 07:58:09 +0000 (02:58 -0500)]

Trivial merge