Merge /spare/repo/linux-2.6/
authorJeff Garzik <jgarzik@pobox.com>
Mon, 29 Aug 2005 19:59:42 +0000 (15:59 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Mon, 29 Aug 2005 19:59:42 +0000 (15:59 -0400)

Trivial merge