Merge branch 'tj-upstream-fixes' of git://htj.dyndns.org/libata-tj into tmp
authorJeff Garzik <jeff@garzik.org>
Thu, 30 Nov 2006 10:20:49 +0000 (05:20 -0500)
committerJeff Garzik <jeff@garzik.org>
Thu, 30 Nov 2006 10:20:49 +0000 (05:20 -0500)

Trivial merge