Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
	arch/sparc/Kconfig

1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
index ac176da1f94e..01964b6e6f6b 100644
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
@@ -689,6 +689,7 @@ static int ata_acpi_run_tf(struct ata_device *dev,
         struct ata_taskfile tf, ptf, rtf;
         unsigned int err_mask;
         const char *level;
+        const char *descr;
         char msg[60];
         int rc;
 
@@ -736,11 +737,13 @@ static int ata_acpi_run_tf(struct ata_device *dev,
                 snprintf(msg, sizeof(msg), "filtered out");
                 rc = 0;
         }
+        descr = ata_get_cmd_descript(tf.command);
 
         ata_dev_printk(dev, level,
-                       "ACPI cmd %02x/%02x:%02x:%02x:%02x:%02x:%02x %s\n",
+                       "ACPI cmd %02x/%02x:%02x:%02x:%02x:%02x:%02x (%s) %s\n",
                        tf.command, tf.feature, tf.nsect, tf.lbal,
-                       tf.lbam, tf.lbah, tf.device, msg);
+                       tf.lbam, tf.lbah, tf.device,
+                       (descr ? descr : "unknown"), msg);
 
         return rc;
 }