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

Hi Paul,

On Thu, Dec 6, 2012 at 6:59 PM, Paul Walmsley [off-list ref] wrote:

Hi Omar,

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

quoted

I have checked next-20121206, it's OK to delete that file as the patch
from Paul is doing that for common clock framework migration; now the
only missing hunk from my original patch should apply to
arch/arm/mach-omap2/cclock44xx_data.c which is the file that now has
ipu_fck and dsp_fck (unused) clocks, I can send a patch to remove them
through linux-omap tree.

OK, will you add the mach-omap2/omap_hwmod_44xx_data.c changes in the same
patch?

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.

Cheers,

Omar