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