lkml.org 
[lkml]   [2012]   [Dec]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    Subjectlinux-next: manual merge of the arm-soc tree with the iommu tree
    Hi all,

    Today's linux-next merge of the arm-soc tree got a conflict in
    arch/arm/mach-omap2/clock44xx_data.c between commit 298ea44f211d ("ARM:
    OMAP4: hwmod data: ipu and dsp to use parent clocks instead of leaf
    clocks") from the iommu tree and commit 13a5b6228679 ("ARM: OMAP44xx:
    clock: drop obsolete clock data") from the arm-soc tree.

    I just deleted the file as the latter did and can carry the fix as
    necessary (no action is required).

    --
    Cheers,
    Stephen Rothwell sfr@canb.auug.org.au
    http://www.canb.auug.org.au/~sfr/
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2012-12-04 06:21    [W:7.426 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site