Automatic merge of /spare/repo/libata-dev branch ahci-msi