tree b68f510ae8924db3385eae783a1294d0af03ae37
parent 24dfb2b5867df24ba03b6c4418312e23b1300aa8
parent 99dcadede42f8898d4c963ef69192ef4b9b76ba8
author Linus Torvalds <torvalds@linux-foundation.org> 1258232727 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1258232727 -0800

Merge git://git.infradead.org/users/dwmw2/iommu-2.6.32

* git://git.infradead.org/users/dwmw2/iommu-2.6.32:
  intel-iommu: Support PCIe hot-plug
  intel-iommu: Obey coherent_dma_mask for alloc_coherent on passthrough
  intel-iommu: Check for 'DMAR at zero' BIOS error earlier.