Re: linux-next: manual merge of the mfd tree with Linus' tree

From: Samuel Ortiz
Date: Tue Mar 22 2011 - 07:17:09 EST


Hi Linus,

On Mon, Mar 21, 2011 at 09:21:34AM +0100, Linus Walleij wrote:
> 2011/3/21 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>:
>
> > I fixed them up (see below) and can carry the fix as necessary.
>
> Fix looks correct, Sam if you push this to the MFD tree before
> the pull request I'll be happy.
I have just dropped 00423735a08e0d4030688496bca93f25c5e60111, since you were
willing to carry it out after the MFD tree merge. Is that still your plan ?

Cheers,
Samuel.

--
Intel Open Source Technology Centre
http://oss.intel.com/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/