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

Merge branch 'linus' into perf/core

Semantic conflict: arch/x86/kernel/cpu/perf_event_intel_ds.c

Merge reason: pick up latest fixes, fix the conflict

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

ca7e0c612005937a4a5a75d3fed90459993de65c
Reading git-diff-tree failed