From: Ingo Molnar <mingo@elte.hu>
Date: Sun, 14 Sep 2008 12:07:00 +0000 (+0200)
Subject: Merge branch 'linus' into x86/iommu
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6e03f99803195e5aaf7f247db31b0d11857ccc35;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'linus' into x86/iommu

Conflicts:
	lib/swiotlb.c

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

6e03f99803195e5aaf7f247db31b0d11857ccc35