Merge branch 'linus' into release

Conflicts:
	drivers/acpi/debug.c

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

1 files changed, 5 insertions, 7 deletions

diff --git a/tools/perf/util/debug.c b/tools/perf/util/debug.c
index 6cddff2bc970..f9c7e3ad1aa7 100644
--- a/tools/perf/util/debug.c
+++ b/tools/perf/util/debug.c
@@ -23,7 +23,7 @@ int eprintf(int level, const char *fmt, ...)
         if (verbose >= level) {
                 va_start(args, fmt);
                 if (use_browser > 0)
-                        ret = browser__show_help(fmt, args);
+                        ret = ui_helpline__show_help(fmt, args);
                 else
                         ret = vfprintf(stderr, fmt, args);
                 va_end(args);
@@ -86,12 +86,10 @@ void trace_event(event_t *event)
                         dump_printf_color("  ", color);
                         for (j = 0; j < 15-(i & 15); j++)
                                 dump_printf_color("   ", color);
-                        for (j = 0; j < (i & 15); j++) {
-                                if (isprint(raw_event[i-15+j]))
-                                        dump_printf_color("%c", color,
-                                                          raw_event[i-15+j]);
-                                else
-                                        dump_printf_color(".", color);
+                        for (j = i & ~15; j <= i; j++) {
+                                dump_printf_color("%c", color,
+                                                isprint(raw_event[j]) ?
+                                                raw_event[j] : '.');
                         }
                         dump_printf_color("\n", color);
                 }