From: Linus Torvalds Date: Thu, 23 Oct 2008 16:53:14 +0000 (-0700) Subject: Merge git://git.infradead.org/iommu-2.6 X-Git-Tag: v2.6.28-rc1~39 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6770ab5cf506f0f00c17a5f063c5506bdc1eb170;p=linux-2.6-omap-h63xx.git Merge git://git.infradead.org/iommu-2.6 * git://git.infradead.org/iommu-2.6: Admit to maintaining VT-d, for my sins. dmar: fix uninitialised 'ret' variable in dmar_parse_dev() intel-iommu: use coherent_dma_mask in alloc_coherent amd_iommu: fix nasty bug that caused ILLEGAL_DEVICE_TABLE_ENTRY errors intel-iommu: IA64 support dmar: remove the quirk which disables dma-remapping when intr-remapping enabled dmar: Use queued invalidation interface for IOTLB and context invalidation dmar: context cache and IOTLB invalidation using queued invalidation dmar: use spin_lock_irqsave() in qi_submit_sync() --- 6770ab5cf506f0f00c17a5f063c5506bdc1eb170