From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Miller <davem@davemloft.net>
Subject: net-2.6 merged into net-next-2.6...
Date: Sun, 25 May 2008 23:39:46 -0700 (PDT)
Message-ID: <20080525.233946.73709524.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]:41403
	"EHLO sunset.davemloft.net" rhost-flags-OK-FAIL-OK-OK)
	by vger.kernel.org with ESMTP id S1752403AbYEZGju (ORCPT
	<rfc822;netdev@vger.kernel.org>); Mon, 26 May 2008 02:39:50 -0400
Received: from localhost (localhost [127.0.0.1])
	by sunset.davemloft.net (Postfix) with ESMTP id 94697C8C21C
	for <netdev@vger.kernel.org>; Sun, 25 May 2008 23:39:46 -0700 (PDT)
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>


In order to resolve some conflicts in wired and wireless
driver stuff, I merged net-2.6 into net-next-2.6

Let me know if I mucked anything up.