From: Ingo Molnar <mingo@kernel.org>
Date: Wed, 6 Jun 2012 15:00:37 +0000 (+0200)
Subject: Merge branch 'perf/urgent' into perf/core
X-Git-Tag: firefly_0821_release~3680^2~2423^2~63
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ff1f74fdcf1881b6c008463c34e9e2a93abe117a;p=firefly-linux-kernel-4.4.55.git

Merge branch 'perf/urgent' into perf/core

Eliminate a conflict in a patch I am going to apply.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

ff1f74fdcf1881b6c008463c34e9e2a93abe117a