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-Tag: v2.6.29-rc1~226^2~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=46483d10e5123d78cf9abf37577aa8e75f18b8a4;p=linux-2.6-omap-h63xx.git

Merge branch 'core/iommu' into core/urgent

Conflicts:
	lib/swiotlb.c
---

46483d10e5123d78cf9abf37577aa8e75f18b8a4