From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Miller <davem@davemloft.net>
Subject: Re: some netdev merges coming...
Date: Thu, 15 May 2008 00:52:05 -0700 (PDT)
Message-ID: <20080515.005205.159203138.davem@davemloft.net>
References: <20080514.045239.34646782.davem@davemloft.net>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
To: netdev@vger.kernel.org
Return-path: <netdev-owner@vger.kernel.org>
Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:55140
	"EHLO sunset.davemloft.net" rhost-flags-OK-FAIL-OK-OK)
	by vger.kernel.org with ESMTP id S1751752AbYEOHwL (ORCPT
	<rfc822;netdev@vger.kernel.org>); Thu, 15 May 2008 03:52:11 -0400
Received: from localhost (localhost [127.0.0.1])
	by sunset.davemloft.net (Postfix) with ESMTP id B0CEBC8C270
	for <netdev@vger.kernel.org>; Thu, 15 May 2008 00:52:05 -0700 (PDT)
In-Reply-To: <20080514.045239.34646782.davem@davemloft.net>
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

From: David Miller <davem@davemloft.net>
Date: Wed, 14 May 2008 04:52:39 -0700 (PDT)

> First, I'll pull Linus's tree into net-2.6 This will be the base for
> future bug fixes, as usual.
> 
> Next, I'll pull net-2.6 into net-next-2.6

Both of these merges are now completed.

Thanks to John Linville for help with the net-next-2.6 merge wrt. the
wireless conflicts.