From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tony Lindgren <tony@atomide.com>
Subject: Re: linux-next: manual merge of the omap tree with the arm tree
Date: Mon, 5 Jul 2010 16:44:02 +0300
Message-ID: <20100705134401.GC15951@atomide.com>
References: <20100705092055.859d31d8.sfr@canb.auug.org.au>
 <alpine.LFD.2.00.1007042144410.6020@xanadu.home>
 <20100705171428.cb58b867.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-kernel-owner@vger.kernel.org>
Content-Disposition: inline
In-Reply-To: <20100705171428.cb58b867.sfr@canb.auug.org.au>
Sender: linux-kernel-owner@vger.kernel.org
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Nicolas Pitre <nico@fluxnic.net>, linux-omap@vger.kernel.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Russell King <rmk@arm.linux.org.uk>
List-Id: linux-next.vger.kernel.org

* Stephen Rothwell <sfr@canb.auug.org.au> [100705 10:08]:
> Hi Nicolas,
> 
> On Sun, 04 Jul 2010 21:46:27 -0400 (EDT) Nicolas Pitre <nico@fluxnic.net> wrote:
> >
> > Yes, the fix is fine.  If you can carry it until either of those is 
> > merged upstream that would be great.
> 
> Thanks for the confirmation.  I can carry the merge fix as long as
> necessary.

Thanks, I've dropped this patch from omap for-next branch, I'll send
it into Russell's patch system.

Regards,

Tony