Merge branch 'linus' into release

Conflicts:
	drivers/acpi/debug.c

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index f77a67303f8b..c9ae299b8342 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -727,7 +727,7 @@ void ata_scsi_error(struct Scsi_Host *host)
         if (ap->pflags & ATA_PFLAG_LOADING)
                 ap->pflags &= ~ATA_PFLAG_LOADING;
         else if (ap->pflags & ATA_PFLAG_SCSI_HOTPLUG)
-                queue_delayed_work(ata_aux_wq, &ap->hotplug_task, 0);
+                schedule_delayed_work(&ap->hotplug_task, 0);
 
         if (ap->pflags & ATA_PFLAG_RECOVERED)
                 ata_port_printk(ap, KERN_INFO, "EH complete\n");
@@ -2214,6 +2214,7 @@ const char *ata_get_cmd_descript(u8 command)
                 { ATA_CMD_SMART,                "SMART" },
                 { ATA_CMD_MEDIA_LOCK,           "DOOR LOCK" },
                 { ATA_CMD_MEDIA_UNLOCK,         "DOOR UNLOCK" },
+                { ATA_CMD_DSM,                  "DATA SET MANAGEMENT" },
                 { ATA_CMD_CHK_MED_CRD_TYP,      "CHECK MEDIA CARD TYPE" },
                 { ATA_CMD_CFA_REQ_EXT_ERR,      "CFA REQUEST EXTENDED ERROR" },
                 { ATA_CMD_CFA_WRITE_NE,         "CFA WRITE SECTORS WITHOUT ERASE" },
@@ -2944,7 +2945,7 @@ static int ata_eh_revalidate_and_attach(struct ata_link *link,
                         ehc->i.flags |= ATA_EHI_SETMODE;
 
                         /* schedule the scsi_rescan_device() here */
-                        queue_work(ata_aux_wq, &(ap->scsi_rescan_task));
+                        schedule_work(&(ap->scsi_rescan_task));
                 } else if (dev->class == ATA_DEV_UNKNOWN &&
                            ehc->tries[dev->devno] &&
                            ata_class_enabled(ehc->classes[dev->devno])) {