Merge /spare/repo/linux-2.6/
authorJeff Garzik <jgarzik@pobox.com>
Wed, 10 Aug 2005 17:43:09 +0000 (13:43 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Wed, 10 Aug 2005 17:43:09 +0000 (13:43 -0400)

Trivial merge