Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...
authorIngo Molnar <mingo@elte.hu>
Sun, 22 May 2011 08:07:37 +0000 (10:07 +0200)
committerIngo Molnar <mingo@elte.hu>
Sun, 22 May 2011 08:10:01 +0000 (10:10 +0200)
commit3ac1bbcf13c56a19927df670f429eb0c3c11f8e5
tree693e2b7f1a9cb0c6ed6d44375e370e1ae08c7ac9
parenta2d063ac216c1618bfc2b4d40b7176adffa63511
parent5538becaec9ca2ff21e7826372941dc46f498487
Merge branch 'perf/core' of git://git./linux/kernel/git/frederic/random-tracing into perf/urgent

Conflicts:
tools/perf/builtin-top.c

Semantic conflict:
util/include/linux/list.h        # fix prefetch.h removal fallout

Signed-off-by: Ingo Molnar <mingo@elte.hu>
tools/perf/builtin-test.c
tools/perf/builtin-top.c
tools/perf/util/evlist.c
tools/perf/util/evlist.h
tools/perf/util/include/linux/list.h
tools/perf/util/python.c