From: Ingo Molnar <mingo@elte.hu>
Date: Sun, 22 May 2011 08:07:37 +0000 (+0200)
Subject: Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic... 
X-Git-Tag: v3.0-rc1~343^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ac1bbcf13c56a19927df670f429eb0c3c11f8e5;p=pandora-kernel.git

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>
---

3ac1bbcf13c56a19927df670f429eb0c3c11f8e5
Reading git-diff-tree failed