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)
commitff1649ff780fb7c0bfbf42d05ffc9b56336b9aa3
tree80ca9b82d398948b01c97b01ad034353dea70ada
parentda758ddede96dd850945d3417ff75209a666ba0d
parentc5b1525533c484238015c48c78f86d49a1bfb86b
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.