From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Miller <davem@davemloft.net>
Subject: Re: linux-next: manual merge of the net tree with the net-current
 tree
Date: Sun, 19 Jun 2011 21:26:02 -0700 (PDT)
Message-ID: <20110619.212602.1216919034584356444.davem@davemloft.net>
References: <20110620125616.e319c55c.sfr@canb.auug.org.au>
	<20110620033951.GA2457@verge.net.au>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from shards.monkeyblade.net ([198.137.202.13]:33962 "EHLO
	shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751030Ab1FTE3V (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Mon, 20 Jun 2011 00:29:21 -0400
In-Reply-To: <20110620033951.GA2457@verge.net.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: horms@verge.net.au
Cc: sfr@canb.auug.org.au, netdev@vger.kernel.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, hans.schillstrom@ericsson.com

From: Simon Horman <horms@verge.net.au>
Date: Mon, 20 Jun 2011 12:39:52 +0900

> I think this should all come out in the wash
> when Dave merges net-2.6 into net-next-2.6.

Indeed, it will.