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: Sat, 05 Jul 2008 23:21:04 -0700 (PDT)
Message-ID: <20080705.232104.187852026.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]:38105
	"EHLO sunset.davemloft.net" rhost-flags-OK-FAIL-OK-OK)
	by vger.kernel.org with ESMTP id S1751442AbYGFGVF (ORCPT
	<rfc822;netdev@vger.kernel.org>); Sun, 6 Jul 2008 02:21:05 -0400
Received: from localhost (localhost [127.0.0.1])
	by sunset.davemloft.net (Postfix) with ESMTP id 20E45C8C1BB
	for <netdev@vger.kernel.org>; Sat,  5 Jul 2008 23:21:04 -0700 (PDT)
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>


To solve some wireless merge hassles and be able to apply some packet
scheduler patches to net-next-2.6 from Patrick McHardy (they depend
upon net-2.6 fixes), I just merged net-next-2.6 into net-2.6

Let me know if I screwed anything up.