From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 11 Aug 2009 12:19:09 +0000 (+0200)
Subject: Merge branch 'linus' into tracing/core
X-Git-Tag: v2.6.32-rc1~718^2~64
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89034bc2c7b839702c00a704e79d112737f98be0;p=pandora-kernel.git

Merge branch 'linus' into tracing/core

Conflicts:
	kernel/trace/trace_events_filter.c

We use the tracing/core version.

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

89034bc2c7b839702c00a704e79d112737f98be0
Reading git-diff-tree failed