Merge branch 'perf/urgent' into perf/core to pick up fixes before pulling new changes
authorIngo Molnar <mingo@kernel.org>
Wed, 23 Sep 2015 07:42:11 +0000 (09:42 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 23 Sep 2015 07:42:11 +0000 (09:42 +0200)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
tools/lib/traceevent/event-parse.c
tools/perf/util/session.c

Simple merge
Simple merge