From: Ingo Molnar Date: Wed, 6 May 2009 06:46:27 +0000 (+0200) Subject: Merge branch 'core/locking' into perfcounters/core X-Git-Tag: firefly_0821_release~13973^2~295 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3611dfb8eda847c1c8e1a052f57206f7fddc6a7c;p=firefly-linux-kernel-4.4.55.git Merge branch 'core/locking' into perfcounters/core Merge reason: we moved a mutex.h commit that originated from the perfcounters tree into core/locking - but now merge back that branch to solve a merge artifact and to pick up cleanups of this commit that happened in core/locking. Signed-off-by: Ingo Molnar --- 3611dfb8eda847c1c8e1a052f57206f7fddc6a7c