Merge branch 'tj-upstream-fixes' of git://htj.dyndns.org/libata-tj into upstream...