Re: linux-next: manual merge of the regmap tree with Linus' tree
From: Mark Brown <hidden>
Date: 2012-01-31 11:12:31
Also in:
lkml
On Tue, Jan 31, 2012 at 01:59:50PM +1100, Stephen Rothwell wrote:
I fixed it up (I think - see below) and can carry the fix as necessary.
Yes, that's the fix I've got. I'm kind of surprised git didn't figure this out for itself, the tag I sent to Linus should be pre-merged into my -next branch as it was sitting in -next for a while. I'll probably merge Linus' tree up at some point when he tags a new -rc. Thanks.
Attachments
- signature.asc [application/pgp-signature] 836 bytes