Merge branch 'upstream-fixes' into upstream

Conflicts:

	drivers/ata/ata_piix.c

diff --cc drivers/ata/ata_piix.c
index 51d919c,01b3530..6846b56
--- 1/drivers/ata/ata_piix.c
--- 2/drivers/scsi/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@@ -550,8 -548,8 +548,8 @@@ static unsigned int piix_sata_present_m
        struct pci_dev *pdev = to_pci_dev(ap->host_set->dev);
        struct piix_host_priv *hpriv = ap->host_set->private_data;
        const unsigned int *map = hpriv->map;
 -      int base = 2 * ap->hard_port_no;
 +      int base = 2 * ap->port_no;
-       unsigned int present = 0;
+       unsigned int present_mask = 0;
        int port, i;
        u16 pcs;