Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
authorJeff Garzik <[email protected]>
Sat, 21 Oct 2006 18:21:11 +0000 (14:21 -0400)
committerJeff Garzik <[email protected]>
Sat, 21 Oct 2006 18:21:11 +0000 (14:21 -0400)

Trivial merge