Merge branch 'linus' into tracing/core

Merge reason: merge latest tracing fixes to avoid conflicts in
              kernel/trace/trace_events_filter.c with upcoming change

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 1 insertions, 3 deletions

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index e7ea77cf6069..065507c46644 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -6110,13 +6110,11 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
                         ata_port_printk(ap, KERN_INFO, "DUMMY\n");
         }
 
-        /* perform each probe synchronously */
-        DPRINTK("probe begin\n");
+        /* perform each probe asynchronously */
         for (i = 0; i < host->n_ports; i++) {
                 struct ata_port *ap = host->ports[i];
                 async_schedule(async_port_probe, ap);
         }
-        DPRINTK("probe end\n");
 
         return 0;
 }