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)
commitb5727270ecd807f75a8d5d1450cec39495fc794a
treeb40753b713a39f41179bd0b48668f363814664fd
parent96f3eda67fcf2598e9d2794398e0e7ab35138ea6
parentd0d0313c2ae4bc220c4ed96ce340860a4e74a2e9
Merge branch 'perf/urgent' into perf/core to pick up fixes before pulling new changes

Signed-off-by: Ingo Molnar <mingo@kernel.org>
tools/lib/traceevent/event-parse.c
tools/perf/util/session.c