Merge git://git.infradead.org/~dwmw2/iommu-2.6.31
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 7 Aug 2009 17:44:11 +0000 (10:44 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 7 Aug 2009 17:44:11 +0000 (10:44 -0700)
* 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.


Trivial merge