tree 693e2b7f1a9cb0c6ed6d44375e370e1ae08c7ac9
parent a2d063ac216c1618bfc2b4d40b7176adffa63511
parent 5538becaec9ca2ff21e7826372941dc46f498487
author Ingo Molnar <mingo@elte.hu> 1306051657 +0200
committer Ingo Molnar <mingo@elte.hu> 1306051801 +0200

Merge branch 'perf/core' of git://git.kernel.org/pub/scm/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>