Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
Jeff Garzik [Tue, 26 Dec 2006 21:38:31 +0000 (16:38 -0500)]

Trivial merge