From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 18 Aug 2011 19:58:46 +0000 (+0200)
Subject: Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux... 
X-Git-Tag: v3.2-rc1~163^2~66
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51887c8230d57c4d9cc68e3784c52c8f0a708655;p=pandora-kernel.git

Merge branch 'perf/core' of git://git./linux/kernel/git/acme/linux into perf/core

Conflicts:
	tools/perf/builtin-stat.c
---

51887c8230d57c4d9cc68e3784c52c8f0a708655
Reading git-diff-tree failed