Merge commit 'v2.6.38-rc4' into imx-for-2.6.39

Conflicts:
	arch/arm/mach-mxs/clock-mx28.c

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

1 files changed, 2 insertions, 2 deletions

diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c
index def7ddc2fd4f..d97256d65980 100644
--- a/tools/perf/builtin-kmem.c
+++ b/tools/perf/builtin-kmem.c
@@ -371,10 +371,10 @@ static void __print_result(struct rb_root *root, struct perf_session *session,
                         addr = data->ptr;
 
                 if (sym != NULL)
-                        snprintf(buf, sizeof(buf), "%s+%Lx", sym->name,
+                        snprintf(buf, sizeof(buf), "%s+%" PRIx64 "", sym->name,
                                  addr - map->unmap_ip(map, sym->start));
                 else
-                        snprintf(buf, sizeof(buf), "%#Lx", addr);
+                        snprintf(buf, sizeof(buf), "%#" PRIx64 "", addr);
                 printf(" %-34s |", buf);
 
                 printf(" %9llu/%-5lu | %9llu/%-5lu | %8lu | %8lu | %6.3f%%\n",