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: Mon, 16 Jun 2008 19:31:20 -0700 (PDT)
Message-ID: <20080616.193120.55836479.davem@davemloft.net>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Cc: sfr@canb.auug.org.au, linux-next@vger.kernel.org
To: netdev@vger.kernel.org
Return-path: <linux-next-owner@vger.kernel.org>
Sender: linux-next-owner@vger.kernel.org
List-Id: netdev.vger.kernel.org


In order to address a wireless and an SCTP conflict,
I've merged net-next-2.6 into net-2.6 (again) :-)

Happy hacking.