Merge commit 'md/for-linus' into async-tx-next

Conflicts:
	drivers/md/raid5.c

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/scsi/mac53c94.c b/drivers/scsi/mac53c94.c
index b12ad7c7c673..18735b39b3d3 100644
--- a/drivers/scsi/mac53c94.c
+++ b/drivers/scsi/mac53c94.c
@@ -75,8 +75,9 @@ static int mac53c94_queue(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *
                 int i;
                 printk(KERN_DEBUG "mac53c94_queue %p: command is", cmd);
                 for (i = 0; i < cmd->cmd_len; ++i)
-                        printk(" %.2x", cmd->cmnd[i]);
-                printk("\n" KERN_DEBUG "use_sg=%d request_bufflen=%d request_buffer=%p\n",
+                        printk(KERN_CONT " %.2x", cmd->cmnd[i]);
+                printk(KERN_CONT "\n");
+                printk(KERN_DEBUG "use_sg=%d request_bufflen=%d request_buffer=%p\n",
                        scsi_sg_count(cmd), scsi_bufflen(cmd), scsi_sglist(cmd));
         }
 #endif