[lkml]   [2010]   [Dec]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    Subjectlinux-next: manual merge of the sound tree with the s5p tree
    Hi Takashi,

    Today's linux-next merge of the sound tree got a conflict in
    sound/soc/samsung/smdk_wm8580.c sound/soc/samsung/smdk_wm9713.c between
    commit 7ca825bed699c77b218ead402202df384556950b ("ASoC: Samsung: Rename
    DMA device") from the s5p tree and various commits from the sound tree.

    I used the versions from the sound tree that seemed to be supersets of the
    ones from the s5p tree.
    Stephen Rothwell
    [unhandled content-type:application/pgp-signature]
     \ /
      Last update: 2010-12-23 01:57    [W:0.037 / U:14.028 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site