Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
David Woodhouse [Mon, 20 Oct 2008 19:16:53 +0000 (20:16 +0100)]
Conflicts:

drivers/pci/intel-iommu.c

1  2 
MAINTAINERS
drivers/pci/intel-iommu.c

diff --cc MAINTAINERS
Simple merge
@@@ -655,8 -637,9 +637,9 @@@ static int __iommu_flush_iotlb(struct i
                printk(KERN_ERR"IOMMU: flush IOTLB failed\n");
        if (DMA_TLB_IAIG(val) != DMA_TLB_IIRG(type))
                pr_debug("IOMMU: tlb flush request %Lx, actual %Lx\n",
-                       DMA_TLB_IIRG(type), DMA_TLB_IAIG(val));
+                       (unsigned long long)DMA_TLB_IIRG(type),
+                       (unsigned long long)DMA_TLB_IAIG(val));
 -      /* flush context entry will implictly flush write buffer */
 +      /* flush iotlb entry will implicitly flush write buffer */
        return 0;
  }