From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751543Ab1FTE3X (ORCPT <rfc822;w@1wt.eu>);
	Mon, 20 Jun 2011 00:29:23 -0400
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-kernel@vger.kernel.org>);
	Mon, 20 Jun 2011 00:29:21 -0400
Date: Sun, 19 Jun 2011 21:26:02 -0700 (PDT)
Message-Id: <20110619.212602.1216919034584356444.davem@davemloft.net>
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
Subject: Re: linux-next: manual merge of the net tree with the net-current
 tree
From: David Miller <davem@davemloft.net>
In-Reply-To: <20110620033951.GA2457@verge.net.au>
References: <20110620125616.e319c55c.sfr@canb.auug.org.au>
	<20110620033951.GA2457@verge.net.au>
X-Mailer: Mew version 6.3 on Emacs 23.2 / Mule 6.0 (HANACHIRUSATO)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.6 (shards.monkeyblade.net [198.137.202.13]); Sun, 19 Jun 2011 21:26:06 -0700 (PDT)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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.