Merge branch 'tj-upstream-fixes' of git://htj.dyndns.org/libata-tj into upstream...
authorJeff Garzik <jeff@garzik.org>
Wed, 9 Aug 2006 03:59:39 +0000 (23:59 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 9 Aug 2006 03:59:39 +0000 (23:59 -0400)

Trivial merge