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-Tag: v2.6.28-rc1~712^2^4~44
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6e03f99803195e5aaf7f247db31b0d11857ccc35;p=linux-2.6-omap-h63xx.git

Merge branch 'linus' into x86/iommu

Conflicts:
	lib/swiotlb.c

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

6e03f99803195e5aaf7f247db31b0d11857ccc35