Merge branch 'upstream-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git...
Jeff Garzik [Mon, 16 Jul 2007 21:59:03 +0000 (17:59 -0400)]

Trivial merge