Merge branch 'for-jeff' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6
authorJeff Garzik <jeff@garzik.org>
Fri, 24 Feb 2006 02:16:07 +0000 (21:16 -0500)
committerJeff Garzik <jeff@garzik.org>
Fri, 24 Feb 2006 02:16:07 +0000 (21:16 -0500)

Trivial merge