Merge branch 'upstream' into pata-drivers
authorJeff Garzik <jeff@garzik.org>
Mon, 4 Sep 2006 10:42:01 +0000 (06:42 -0400)
committerJeff Garzik <jeff@garzik.org>
Mon, 4 Sep 2006 10:42:01 +0000 (06:42 -0400)

Trivial merge