Merge tag 'asoc-v3.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v3.17

A few more driver specific fixes on top of the currently pending fixes
(which are already in your tree but not Linus').

1 files changed, 2 insertions, 2 deletions

diff --git a/tools/perf/scripts/python/check-perf-trace.py b/tools/perf/scripts/python/check-perf-trace.py
index 4647a7694cf6..334599c6032c 100644
--- a/tools/perf/scripts/python/check-perf-trace.py
+++ b/tools/perf/scripts/python/check-perf-trace.py
@@ -27,7 +27,7 @@ def trace_end():
 
 def irq__softirq_entry(event_name, context, common_cpu,
         common_secs, common_nsecs, common_pid, common_comm,
-        vec):
+        common_callchain, vec):
                 print_header(event_name, common_cpu, common_secs, common_nsecs,
                         common_pid, common_comm)
 
@@ -38,7 +38,7 @@ def irq__softirq_entry(event_name, context, common_cpu,
 
 def kmem__kmalloc(event_name, context, common_cpu,
         common_secs, common_nsecs, common_pid, common_comm,
-        call_site, ptr, bytes_req, bytes_alloc,
+        common_callchain, call_site, ptr, bytes_req, bytes_alloc,
         gfp_flags):
                 print_header(event_name, common_cpu, common_secs, common_nsecs,
                         common_pid, common_comm)