Merge git://git.infradead.org/iommu-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Apr 2011 16:56:35 +0000 (09:56 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Apr 2011 16:56:35 +0000 (09:56 -0700)
commitec616048ea21da2b32ed1a820e637c74c61c618c
tree3a6525a995fe41f520cb573da81fef5515d70f33
parentdf7e130384efd1c732aa08648dad46687fee3d96
parent51a63e67da6056c13b5b597dcc9e1b3bd7ceaa55
Merge git://git.infradead.org/iommu-2.6

* git://git.infradead.org/iommu-2.6:
  intel_iommu: disable all VT-d PMRs when TXT launched
  intel-iommu: Fix get_domain_for_dev() error path
  intel-iommu: Unlink domain from iommu
  intel-iommu: Fix use after release during device attach
drivers/pci/intel-iommu.c