From mboxrd@z Thu Jan  1 00:00:00 1970
From: Greg KH <greg@kroah.com>
Subject: Re: linux-next: manual merge of the staging tree with the  tree
Date: Thu, 19 Mar 2009 08:53:31 -0700
Message-ID: <20090319155331.GA26076@kroah.com>
References: <20090319211247.5976c505.sfr@canb.auug.org.au> <20090319153245.GA13963@kroah.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-next-owner@vger.kernel.org>
Received: from kroah.org ([198.145.64.141]:56952 "EHLO coco.kroah.org"
	rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP
	id S1750900AbZCSPzn (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Thu, 19 Mar 2009 11:55:43 -0400
Content-Disposition: inline
In-Reply-To: <20090319153245.GA13963@kroah.com>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org

On Thu, Mar 19, 2009 at 08:32:45AM -0700, Greg KH wrote:
> On Thu, Mar 19, 2009 at 09:12:47PM +1100, Stephen Rothwell wrote:
> > Hi Greg,
> > 
> > Today's linux-next merge of the staging tree got conflicts due to the
> > removal of the benet driver from staging in Linus' tree.
> 
> Yes, sorry, Linus took that patch and I didn't have a chance to update
> my tree yet.  Give me an hour or so to get it merged up properly.

Now merged up properly and pushed out.

thanks,

greg k-h