lkml.org 
[lkml]   [2012]   [Jan]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: linux-next: manual merge of the crypto tree with the tegra tree
    Hi Olof,

    On Sun, 22 Jan 2012 20:24:16 -0800 Olof Johansson <olof@lixom.net> wrote:
    >
    > I should cherry-pick in the same change as Herbert is carrying, and do
    > the rest of the fuse changes on top of that. I'll do that for
    > tomorrows -next.

    Only if its going to get much worse or you need the change. The conflict
    is trivial ...

    --
    Cheers,
    Stephen Rothwell sfr@canb.auug.org.au
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2012-01-23 06:09    [W:0.055 / U:20.700 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site