[lkml]   [2012]   [Mar]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    Subjectlinux-next: manual merge of the arm-soc tree with Linus' tree
    Hi all,

    Today's linux-next merge of the arm-soc tree got a conflict in
    arch/arm/mach-shmobile/board-mackerel.c between commit 1740d3448012
    ("ARM: mach-shmobile: mackerel: Reserve DMA memory for the frame buffer")
    from Linus' tree and commit 5d7220ec000f ("ARM: mach-shmobile: sh7372
    map_io and init_early update") from the arm-soc tree.

    The latter moved the code to another file
    arch/arm/mach-shmobile/setup-sh7372.c and I have no idea how to fix this
    up, so I just removed the change done by the former.
    Stephen Rothwell
    [unhandled content-type:application/pgp-signature]
     \ /
      Last update: 2012-03-15 07:53    [W:0.022 / U:10.728 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site