Messages in this thread | | | Date | Fri, 7 Dec 2012 01:40:21 +0000 (UTC) | From | Paul Walmsley <> | Subject | Re: linux-next: manual merge of the arm-soc tree with the iommu tree |
| |
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
| |