From mboxrd@z Thu Jan 1 00:00:00 1970 From: Samuel Ortiz Subject: Re: linux-next: manual merge of the mfd tree with Linus' tree Date: Tue, 22 Mar 2011 12:16:52 +0100 Message-ID: <20110322111651.GE2351@sortiz-mobl> References: <20110321122615.8a639909.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mga09.intel.com ([134.134.136.24]:38688 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752280Ab1CVLQz (ORCPT ); Tue, 22 Mar 2011 07:16:55 -0400 Content-Disposition: inline In-Reply-To: Sender: linux-next-owner@vger.kernel.org List-ID: To: Linus Walleij Cc: Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Philippe Langlais Hi Linus, On Mon, Mar 21, 2011 at 09:21:34AM +0100, Linus Walleij wrote: > 2011/3/21 Stephen Rothwell : > > > 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/