From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner+w=401wt.eu-S964893AbXC0GU2@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S964893AbXC0GU2 (ORCPT <rfc822;w@1wt.eu>);
	Tue, 27 Mar 2007 02:20:28 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S964896AbXC0GU2
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Tue, 27 Mar 2007 02:20:28 -0400
Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:52708
	"EHLO sunset.davemloft.net" rhost-flags-OK-FAIL-OK-OK)
	by vger.kernel.org with ESMTP id S964893AbXC0GU1 (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Tue, 27 Mar 2007 02:20:27 -0400
Date: Mon, 26 Mar 2007 23:20:26 -0700 (PDT)
Message-Id: <20070326.232026.35016469.davem@davemloft.net>
To: akpm@linux-foundation.org
Cc: linux-kernel@vger.kernel.org
Subject: Re: 2.6.21-rc5-mm1
From: David Miller <davem@davemloft.net>
In-Reply-To: <20070326205706.a750bb35.akpm@linux-foundation.org>
References: <20070326205706.a750bb35.akpm@linux-foundation.org>
X-Mailer: Mew version 5.1.52 on Emacs 21.4 / Mule 5.0 (SAKAKI)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
X-Mailing-List: linux-kernel@vger.kernel.org

From: Andrew Morton <akpm@linux-foundation.org>
Date: Mon, 26 Mar 2007 20:57:06 -0800

> - I dropped davem's net development tree due to a large collision with
>   git-wireless.  I figured git-wireless would need more debugging ;)

I sent some email to John Linville in order to discuss ways
to resolve this so you can import all of our work.

I believe John is away for a few days so whenever he gets
back to reading email we'll work this out.