Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik...

Pull libata updates from Jeff Garzik:
 "Simple stuff.  See one-line summaries."

* tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  pata_samsung_cf: use module_platform_driver_probe()
  [libata] Avoid specialized TLA's in ZPODD's Kconfig
  libata-acpi.c: fix copy and paste mistake in ata_acpi_register_power_resource
  sata_fsl: Remove redundant NULL check before kfree
  ahci: Add Device IDs for Intel Wellsburg PCH
  ata_piix: Add MODULE_PARM_DESC to prefer_ms_hyperv

diff --combined drivers/ata/libata-acpi.c
index beea3115577e31a687532cbc1cd3319d900e34a6,cb3eab6d520fb2f7a63dea8e8f9cde1a139cbda2..8a52dab412e2a8013f36bd547460924c79c996aa
--- 1/drivers/ata/libata-acpi.c
--- 2/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
@@@ -1027,7 -1027,7 +1027,7 @@@ static void ata_acpi_register_power_res
  
        handle = ata_dev_acpi_handle(dev);
        if (handle)
-               acpi_dev_pm_remove_dependent(handle, &sdev->sdev_gendev);
+               acpi_dev_pm_add_dependent(handle, &sdev->sdev_gendev);
  }
  
  static void ata_acpi_unregister_power_resource(struct ata_device *dev)
@@@ -1144,8 -1144,13 +1144,8 @@@ static int ata_acpi_find_device(struct 
                return -ENODEV;
  }
  
 -static int ata_acpi_find_dummy(struct device *dev, acpi_handle *handle)
 -{
 -      return -ENODEV;
 -}
 -
  static struct acpi_bus_type ata_acpi_bus = {
 -      .find_bridge = ata_acpi_find_dummy,
 +      .name = "ATA",
        .find_device = ata_acpi_find_device,
  };