From: Ingo Molnar <mingo@elte.hu>
Date: Sat, 17 Oct 2009 07:58:25 +0000 (+0200)
Subject: Merge commit 'v2.6.32-rc5' into perf/probes
X-Git-Tag: v2.6.33-rc1~399^2~191
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb3c3e807140816b5f5fd4840473ee52a916ad4f;p=pandora-kernel.git

Merge commit 'v2.6.32-rc5' into perf/probes

Conflicts:
	kernel/trace/trace_event_profile.c

Merge reason: update to -rc5 and resolve conflict.

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

bb3c3e807140816b5f5fd4840473ee52a916ad4f
Reading git-diff-tree failed