Re: linux-next: manual merge of the crypto tree with the tegra tree

[Stephen Rothwell]

Hi Olof,

On Sun, 22 Jan 2012 20:24:16 -0800 Olof Johansson <olof@xxxxxxxxx> 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@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature