Got another couple sata_mv fixes pending too...  coming soon.

Please pull from 'upstream-linus' branch of
master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-linus

to receive the following updates:

 drivers/ata/ata_piix.c     |    2 +-
 drivers/ata/libata-core.c  |    1 -
 drivers/ata/libata-scsi.c  |    2 +-
 drivers/ata/pata_acpi.c    |    4 ++--
 drivers/ata/pata_amd.c     |    7 ++-----
 drivers/ata/pata_cs5536.c  |   10 +++++-----
 drivers/ata/pata_jmicron.c |    3 ++-
 drivers/ata/pata_legacy.c  |    2 --
 drivers/ata/pata_marvell.c |    4 ++--
 drivers/ata/pata_scc.c     |    2 ++
 drivers/ata/sata_mv.c      |    4 ++--
 drivers/ata/sata_promise.c |    2 +-
 drivers/ata/sata_via.c     |    4 ++--
 13 files changed, 22 insertions(+), 25 deletions(-)

Akira Iguchi (1):
      pata_scc.c: add thaw ops

Harvey Harrison (11):
      ata: make ata_scsiop_inq_89 static in libata-scsi.c
      ata: fix sparse warning in libata-core.c
      ata: fix sparse warning in ata_piix.c
      ata: fix sparse warning in sata_promise.c
      ata: fix sparse warning in sata_via.c
      ata: fix sparse warnings in sata_mv.c
      ata: sparse fixes for pata_amd.c
      ata: fix sparse warning in pata_cs5536.c
      ata: fix sparse warning in pata_jmicron.c
      ata: fix sparse warning in pata_marvell.c
      ata: fix sparse warning in pata_acpi.c

Martin K. Petersen (1):
      pata_cs5536.c bugfix

Tejun Heo (1):
      pata_legacy: don't call ata_host_detach() after initialization failure

diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index 9c2515f..752e7d2 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -1652,7 +1652,7 @@ static int __devinit piix_init_one(struct pci_dev *pdev,
 		u8 tmp;
 		pci_read_config_byte(pdev, PIIX_SCC, &tmp);
 		if (tmp == PIIX_AHCI_DEVICE) {
-			int rc = piix_disable_ahci(pdev);
+			rc = piix_disable_ahci(pdev);
 			if (rc)
 				return rc;
 		}
diff --git ...
[ message continues ]