Re: linux-next: manual merge of the crypto tree with the tegra tree
From: Stephen Rothwell <hidden>
Date: 2012-01-23 05:05:58
Also in:
lkml
Hi Olof, On Sun, 22 Jan 2012 20:24:16 -0800 Olof Johansson [off-list ref] 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
Attachments
- (unnamed) [application/pgp-signature] 836 bytes