From: Ingo Molnar <mingo@elte.hu>
Date: Sat, 18 Jul 2009 10:19:57 +0000 (+0200)
Subject: Merge branch 'linus' into tracing/core
X-Git-Tag: v2.6.33-rc1~399^2~311
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=45bceffc3013bda7d2ebc7802e9b153b674e2d44;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'linus' into tracing/core

Merge reason: tracing/core was on an older, pre-rc1 base.

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

45bceffc3013bda7d2ebc7802e9b153b674e2d44