Merge branch 'for-jeff' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6
authorJeff Garzik <jeff@garzik.org>
Tue, 28 Feb 2006 23:03:45 +0000 (18:03 -0500)
committerJeff Garzik <jeff@garzik.org>
Tue, 28 Feb 2006 23:03:45 +0000 (18:03 -0500)

Trivial merge