From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 7 Aug 2009 17:44:11 +0000 (-0700)
Subject: Merge git://git.infradead.org/~dwmw2/iommu-2.6.31
X-Git-Tag: v2.6.31-rc6~43
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=ff1649ff780fb7c0bfbf42d05ffc9b56336b9aa3;p=linux.git

Merge git://git.infradead.org/~dwmw2/iommu-2.6.31

* git://git.infradead.org/~dwmw2/iommu-2.6.31:
  intel-iommu: Fix enabling snooping feature by mistake
  intel-iommu: Mask physical address to correct page size in intel_map_single()
  intel-iommu: Correct sglist size calculation.
---

ff1649ff780fb7c0bfbf42d05ffc9b56336b9aa3