Merge 'tip/perf/urgent' into perf/core to pick fixes
authorArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 2 Mar 2015 14:45:49 +0000 (11:45 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 2 Mar 2015 14:45:49 +0000 (11:45 -0300)
Needed to build perf/core buildable in some cases.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
1  2 
arch/x86/kernel/kprobes/opt.c
tools/perf/util/evlist.h
tools/perf/util/symbol-elf.c

Simple merge
Simple merge
Simple merge