Merge branch 'upstream' into pata-drivers
authorJeff Garzik <jeff@garzik.org>
Thu, 31 Aug 2006 04:02:26 +0000 (00:02 -0400)
committerJeff Garzik <jeff@garzik.org>
Thu, 31 Aug 2006 04:02:26 +0000 (00:02 -0400)

Trivial merge