Merge ../linux-2.6
authorJeff Garzik <jeff@garzik.org>
Fri, 2 Feb 2007 13:31:55 +0000 (08:31 -0500)
committerJeff Garzik <jeff@garzik.org>
Fri, 2 Feb 2007 13:31:55 +0000 (08:31 -0500)

Trivial merge