[lkml]   [2012]   [Jan]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
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 <> 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 ...

Stephen Rothwell
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2012-01-23 06:09    [W:0.034 / U:4.052 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site