Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755074Ab1CVLQ5 (ORCPT ); Tue, 22 Mar 2011 07:16:57 -0400 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 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.63,224,1299484800"; d="scan'208";a="722827345" Date: Tue, 22 Mar 2011 12:16:52 +0100 From: Samuel Ortiz To: Linus Walleij Cc: Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Philippe Langlais Subject: Re: linux-next: manual merge of the mfd tree with Linus' tree 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 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 778 Lines: 23 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/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/