From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 5 Jan 2009 13:17:24 +0000 (+0100)
Subject: Merge branch 'core/iommu' into core/urgent
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=46483d10e5123d78cf9abf37577aa8e75f18b8a4;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branch 'core/iommu' into core/urgent

Conflicts:
	lib/swiotlb.c
---

46483d10e5123d78cf9abf37577aa8e75f18b8a4