Subject: linux-next: manual merge of the dwmw2-iommu tree with the x86 tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 11 May 2009 14:46:08 +1000

Hi David,

Today's linux-next merge of the dwmw2-iommu tree got a conflict in
drivers/pci/intr_remapping.c between commit
937582382c71b75b29fbb92615629494e1a05ac0 ("x86, intr-remap: enable
interrupt remapping early") from the x86 tree and commit
c416daa98a584596df21ee2c26fac6579ee58f57 ("intel-iommu: Tidy up
iommu->gcmd handling") from the dwmw2-iommu tree.

The former removes the code that the latter is modifying, so I just
removed the code ("if (mode == 0) { ... }" in iommu_set_intr_remapping).
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/