Merge /spare/repo/linux-2.6/
authorJeff Garzik <jgarzik@pretzel.yyz.us>
Sun, 26 Jun 2005 22:06:06 +0000 (18:06 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Sun, 26 Jun 2005 22:06:06 +0000 (18:06 -0400)

Trivial merge