From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 4 Nov 2009 10:54:15 +0000 (+0100)
Subject: Merge commit 'v2.6.32-rc6' into perf/core
X-Git-Tag: v2.6.33-rc1~399^2~165^2~34
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2e71271535fde493c32803b1f34789f97efcb5e;p=pandora-kernel.git

Merge commit 'v2.6.32-rc6' into perf/core

Conflicts:
	tools/perf/Makefile

Merge reason: Resolve the conflict, merge to upstream and merge in
              perf fixes so we can add a dependent patch.

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

a2e71271535fde493c32803b1f34789f97efcb5e
Reading git-diff-tree failed