From: Ingo Molnar Date: Thu, 7 May 2009 09:17:13 +0000 (+0200) Subject: Merge branch 'linus' into tracing/core X-Git-Tag: MMI-PSA29.97-13-9~27984^2~63 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=44347d947f628060b92449702071bfe1d31dfb75;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge branch 'linus' into tracing/core Merge reason: tracing/core was on a .30-rc1 base and was missing out on on a handful of tracing fixes present in .30-rc5-almost. Signed-off-by: Ingo Molnar --- 44347d947f628060b92449702071bfe1d31dfb75