Merge git://git.infradead.org/iommu-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 Feb 2009 17:31:21 +0000 (09:31 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 Feb 2009 17:31:21 +0000 (09:31 -0800)
* 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


Trivial merge