From: Thomas Gleixner <tglx@linutronix.de>
Date: Mon, 28 Jun 2010 20:33:13 +0000 (+0200)
Subject: Merge branch 'linus' into perf/core
X-Git-Tag: firefly_0821_release~9833^2~776^2~63
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f384c954c9fe3d3c6fce5ae66b67f2ddd947d098;p=firefly-linux-kernel-4.4.55.git

Merge branch 'linus' into perf/core

Reason: Further changes conflict with upstream fixes

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---

f384c954c9fe3d3c6fce5ae66b67f2ddd947d098