Merge branch 'upstream' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6...
authorJeff Garzik <jeff@garzik.org>
Fri, 23 Jun 2006 03:33:23 +0000 (23:33 -0400)
committerJeff Garzik <jeff@garzik.org>
Fri, 23 Jun 2006 03:33:23 +0000 (23:33 -0400)

Trivial merge