From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Miller <davem@davemloft.net>
Subject: more GIT merges...
Date: Tue, 01 Dec 2009 23:34:11 -0800 (PST)
Message-ID: <20091201.233411.71102699.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]:49284
	"EHLO sunset.davemloft.net" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1751688AbZLBHeF (ORCPT
	<rfc822;netdev@vger.kernel.org>); Wed, 2 Dec 2009 02:34:05 -0500
Received: from localhost (localhost [127.0.0.1])
	by sunset.davemloft.net (Postfix) with ESMTP id 6D66D24C6E4
	for <netdev@vger.kernel.org>; Tue,  1 Dec 2009 23:34:11 -0800 (PST)
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>


To resolve some conflicts I've just merged Linus's tree into
net-2.6 and then net-2.6 into net-next-2.6

Just FYI...