From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 13 Apr 2009 22:02:16 +0000 (+0200)
Subject: Merge branch 'linus' into tracing/core
X-Git-Tag: v2.6.31-rc1~401^2~169
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=b5c851a88a369854c04e511cefb84ea2d0cfa209;p=linux-2.6-block.git

Merge branch 'linus' into tracing/core

Merge reason: merge latest tracing fixes to avoid conflicts in
              kernel/trace/trace_events_filter.c with upcoming change

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

b5c851a88a369854c04e511cefb84ea2d0cfa209