Merge branch 'for-jeff' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6
authorJeff Garzik <jgarzik@pobox.com>
Thu, 1 Dec 2005 07:08:27 +0000 (02:08 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Thu, 1 Dec 2005 07:08:27 +0000 (02:08 -0500)

Trivial merge