lkml.org 
[lkml]   [2010]   [Jul]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: linux-next: manual merge of the staging-next tree with the v4l-dvb tree
    On Wed, Jul 28, 2010 at 03:27:36PM +1000, Stephen Rothwell wrote:
    > Hi Greg,
    >
    > Today's linux-next merge of the staging-next tree got a conflict in
    > drivers/staging/Kconfig between commit
    > 44d349d2b19019e0b5912bc4e6c8531e50b394aa ("V4L/DVB: staging/lirc: wire up
    > Kconfig and Makefile bits") from the v4l-dvb tree and several commits
    > from the staging-next tree.
    >
    > Just overlapping additions. I fixed it up (see below) and can carry the
    > fix as necessary.

    Looks good to me.

    thanks,

    greg k-h


    \
     
     \ /
      Last update: 2010-07-28 15:59    [W:0.020 / U:178.892 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site