lkml.org 
[lkml]   [2009]   [Jul]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    Subjectlinux-next: manual merge of the sound tree with the davinci tree
    Hi Takashi,

    Today's linux-next merge of the sound tree got a conflict in
    sound/soc/davinci/davinci-evm.c between commit
    95d0d986d09ac25a5b9f2bf28f289ab0823e86d5 ("davinci: EDMA: multiple CCs,
    channel mapping and API changes") from the davinci tree and commit
    04f80f5c486b39446af44e218dba90ec210d61ca ("ASoC: Add machine driver
    support for DM646x") from the sound tree.

    The latter removes the code modified by the former. I have just used the
    latter.
    --
    Cheers,
    Stephen Rothwell sfr@canb.auug.org.au
    http://www.canb.auug.org.au/~sfr/
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2009-07-23 03:23    [W:4.204 / U:1.288 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site