From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 23 Sep 2010 06:02:09 +0000 (+0200)
Subject: Merge branch 'linus' into perf/core
X-Git-Tag: v2.6.37-rc1~214^2~34
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0303d71c2fb9bcb90a8d48e6462c78c86f70ce6;p=pandora-kernel.git

Merge branch 'linus' into perf/core

Conflicts:
	arch/sparc/kernel/perf_event.c

Merge reason: Resolve the conflict.

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

d0303d71c2fb9bcb90a8d48e6462c78c86f70ce6
Reading git-diff-tree failed