From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Miller <davem@davemloft.net>
Subject: net-2.6 and net-next-2.6 rebased...
Date: Thu, 20 May 2010 23:00:38 -0700 (PDT)
Message-ID: <20100520.230038.69945400.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]:35288
	"EHLO sunset.davemloft.net" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1756901Ab0EUGA3 (ORCPT
	<rfc822;netdev@vger.kernel.org>); Fri, 21 May 2010 02:00:29 -0400
Received: from localhost (localhost [127.0.0.1])
	by sunset.davemloft.net (Postfix) with ESMTP id D23AE24C090
	for <netdev@vger.kernel.org>; Thu, 20 May 2010 23:00:38 -0700 (PDT)
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>


I have rebased these two trees now that Linus has pulled in the
net-next-2.6 merge.

We will take fixes and things like new drivers, device ID additions
etc. into net-2.6

After 2.6.35-rc1 is released, I will start adding cleanups and new
feature changes into net-next-2.6

Thanks.