From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 2 Apr 2010 17:37:50 +0000 (+0200)
Subject: Merge branch 'perf/urgent' into perf/core
X-Git-Tag: v2.6.35-rc1~522^2~133
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec5e61aabeac58670691bd0613388d16697d0d81;p=pandora-kernel.git

Merge branch 'perf/urgent' into perf/core

Conflicts:
	arch/x86/kernel/cpu/perf_event.c

Merge reason: Resolve the conflict, pick up fixes

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

ec5e61aabeac58670691bd0613388d16697d0d81
Reading git-diff-tree failed