Re: linux-next: manual merge of the arm-soc tree with the iommutree

[Paul Walmsley]

On Thu, 6 Dec 2012, Omar Ramirez Luna wrote:

> I was planning to wait until linux-omap had the changes from iommu
> tree (probably at rc1), if the merge conflict resulted in
> arch/arm/mach-omap2/cclock44xx_data.c still having ipu and dsp clocks,
> in this case the hwmod data changes wouldn't be needed in the patch.

OK makes sense.

- Paul
--
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/