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: Tue, 10 Jun 2008 02:50:59 -0700 (PDT)
Message-ID: <20080610.025059.37807108.davem@davemloft.net>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Cc: linville@tuxdriver.com, jgarzik@pobox.com, sfr@canb.auug.org.au
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]:33360
	"EHLO sunset.davemloft.net" rhost-flags-OK-FAIL-OK-OK)
	by vger.kernel.org with ESMTP id S1751359AbYFJJu7 (ORCPT
	<rfc822;netdev@vger.kernel.org>); Tue, 10 Jun 2008 05:50:59 -0400
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>


There were a few small wireless conflicts but I think
I handled them correctly.

Please send me any fixup patches which might be necessary.

Thanks!