From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 7 Apr 2009 09:15:40 +0000 (+0200)
Subject: Merge branch 'linus' into core/softlockup
X-Git-Tag: firefly_0821_release~14576^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5e34437840d33554f69380584311743b39e8fbeb;p=firefly-linux-kernel-4.4.55.git

Merge branch 'linus' into core/softlockup

Conflicts:
	kernel/sysctl.c
---

5e34437840d33554f69380584311743b39e8fbeb