From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 15 Jul 2008 21:12:58 +0000 (+0200)
Subject: Merge branch 'linus' into core/softlockup
X-Git-Tag: firefly_0821_release~19444^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1e09481365ce248dbb4eb06dad70129bb5807037;p=firefly-linux-kernel-4.4.55.git

Merge branch 'linus' into core/softlockup

Conflicts:

	kernel/softlockup.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

1e09481365ce248dbb4eb06dad70129bb5807037