Merge with /home/shaggy/git/linus-clean/

Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>

1 files changed, 0 insertions, 5 deletions

diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
index d7a38b6713f9..5feb886c3392 100644
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -180,11 +180,6 @@ static void scsi_host_dev_release(struct device *dev)
         scsi_destroy_command_freelist(shost);
         kfree(shost->shost_data);
 
-        /*
-         * Some drivers (eg aha1542) do scsi_register()/scsi_unregister()
-         * during probing without performing a scsi_set_device() in between.
-         * In this case dev->parent is NULL.
-         */
         if (parent)
                 put_device(parent);
         kfree(shost);