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

* git://git.infradead.org/iommu-2.6:
  intel-iommu: Fix address wrap on 32-bit kernel.
  intel-iommu: Enable DMAR on 32-bit kernel.
  intel-iommu: fix PCI device detach from virtual machine
  intel-iommu: VT-d page table to support snooping control bit
  iommu: Add domain_has_cap iommu_ops
  intel-iommu: Snooping control support

Fixed trivial conflicts in arch/x86/Kconfig and drivers/pci/intel-iommu.c

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/kernel/amd_iommu.c
Simple merge

diff --cc drivers/base/iommu.c
Simple merge

diff --cc drivers/pci/intel-iommu.c
index 9dbd5066acafee0594b7d20938822d6f7a3f3dbd,002c8b95edf8f75d5f70a99fb42ec4593693b5ff..23e56a564e05056a208ac41d98828d32987865b7
--- 1/drivers/pci/intel-iommu.c
--- 2/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@@ -2282,11 -2471,8 +2320,9 @@@ static void intel_free_coherent(struct 
        free_pages((unsigned long)vaddr, order);
  }
  
- #define SG_ENT_VIRT_ADDRESS(sg)       (sg_virt((sg)))
- 
 -void intel_unmap_sg(struct device *hwdev, struct scatterlist *sglist,
 -                  int nelems, int dir)
 +static void intel_unmap_sg(struct device *hwdev, struct scatterlist *sglist,
 +                         int nelems, enum dma_data_direction dir,
 +                         struct dma_attrs *attrs)
  {
        int i;
        struct pci_dev *pdev = to_pci_dev(hwdev);
@@@ -2343,10 -2529,10 +2379,10 @@@ static int intel_nontranslate_map_sg(st
        return nelems;
  }
  
 -int intel_map_sg(struct device *hwdev, struct scatterlist *sglist, int nelems,
 -               int dir)
 +static int intel_map_sg(struct device *hwdev, struct scatterlist *sglist, int nelems,
 +                      enum dma_data_direction dir, struct dma_attrs *attrs)
  {
-       void *addr;
+       phys_addr_t addr;
        int i;
        struct pci_dev *pdev = to_pci_dev(hwdev);
        struct dmar_domain *domain;

diff --cc include/linux/intel-iommu.h
Simple merge