From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 19 Nov 2008 08:44:37 +0000 (+0100)
Subject: Merge branch 'linus' into sched/core
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3ac3ba0b396fd99550e08034b0e4c27fdf39c252;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'linus' into sched/core

Conflicts:
	kernel/Makefile
---

3ac3ba0b396fd99550e08034b0e4c27fdf39c252