Merge branch 'e100-fixes' of git://198.78.49.142/~jbrandeb/linux-2.6
authorJeff Garzik <jeff@garzik.org>
Fri, 17 Mar 2006 00:15:26 +0000 (19:15 -0500)
committerJeff Garzik <jeff@garzik.org>
Fri, 17 Mar 2006 00:15:26 +0000 (19:15 -0500)

Trivial merge