lkml.org 
[lkml]   [2011]   [Sep]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    Subjectlinux-next: manual merge of the trivial tree with the v4l-dvb tree
    Hi Jiri,

    Today's linux-next merge of the trivial tree got a conflict in
    drivers/media/video/s5p-fimc/fimc-capture.c between commit 2319c539e39b
    ("[media] s5p-fimc: Remove sensor management code from FIMC capture
    driver") from the v4l-dvb tree and commit 18df7b82e25c ("treewide:
    Correct spelling of successfully in comments") from the trivial tree.

    The former removed the code that the latter modified.
    --
    Cheers,
    Stephen Rothwell sfr@canb.auug.org.au
    http://www.canb.auug.org.au/~sfr/
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2011-09-27 06:25    [W:3.469 / U:0.384 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site