From: Ingo Molnar Date: Fri, 13 Mar 2009 00:33:21 +0000 (+0100) Subject: Merge branch 'core/locking' into tracing/ftrace X-Git-Tag: MMI-PSA29.97-13-9~27984^2~240 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=480c93df5b99699390f93a7024c9f60d09da0e96;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge branch 'core/locking' into tracing/ftrace --- 480c93df5b99699390f93a7024c9f60d09da0e96