Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
authorJeff Garzik <jeff@garzik.org>
Sat, 3 Mar 2007 00:40:24 +0000 (19:40 -0500)
committerJeff Garzik <jeff@garzik.org>
Sat, 3 Mar 2007 00:40:24 +0000 (19:40 -0500)

Trivial merge