tree 8b789dd736a98e3671be6e7c405c4800625fb30d
parent 6aa03ab06978e97b3e0720f83280d7841051916b
parent 084eb960e81505680a9963665722d1bfd94af6a7
author Linus Torvalds <torvalds@linux-foundation.org> 1235583081 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1235583081 -0800

Merge git://git.infradead.org/iommu-2.6

* git://git.infradead.org/iommu-2.6:
  intel-iommu: fix endless "Unknown DMAR structure type" loop
  VT-d: handle Invalidation Queue Error to avoid system hang
  intel-iommu: fix build error with INTR_REMAP=y and DMAR=n