From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 16 Jun 2011 11:26:23 +0000 (+0200)
Subject: Merge branch 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/git/roste... 
X-Git-Tag: v3.1-rc1~299^2~39
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af07ce3e77d3b24ab1d71fcc5833d41800f23b2b;p=pandora-kernel.git

Merge branch 'tip/perf/core-2' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into perf/core

Conflicts:
	Makefile
---

af07ce3e77d3b24ab1d71fcc5833d41800f23b2b
Reading git-diff-tree failed