Merge upstream (approx. 2.6.12-git8) into 'janitor' branch of netdev-2.6.
authorJeff Garzik <jgarzik@pretzel.yyz.us>
Sun, 26 Jun 2005 21:11:03 +0000 (17:11 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Sun, 26 Jun 2005 21:11:03 +0000 (17:11 -0400)

Trivial merge