lkml.org 
[lkml]   [2012]   [Dec]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: 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


\
 
 \ /
  Last update: 2012-12-07 03:21    [W:0.069 / U:0.540 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site