Re: [PATCH 10/30] ARM: omap/iommu: always provide iommu debug code

From: Arnd Bergmann
Date: Sun Oct 02 2011 - 14:02:58 EST


On Sunday 02 October 2011 18:34:52 Ohad Ben-Cohen wrote:
>
> The driver has moved to drivers/iommu/ and changed a bit, but this
> patch is still relevant.
>
> The merge conflict will be trivial to resolve, but if you prefer, we
> can prevent it by taking this patch via the iommu tree.

Yes, please take it into the iommu tree, so I don't have to track
the conflict.

Thanks,

Arnd
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/