Date: Tue, 17 Nov 2009 00:07:20 -0800 (PST)
Message-Id: <20091117.000720.01506428.davem@davemloft.net>
To: sfr@canb.auug.org.au
Cc: netdev@vger.kernel.org, linux-next@vger.kernel.org,
       linux-kernel@vger.kernel.org, w.sang@pengutronix.de, chripell@fsfe.org,
       wg@grandegger.com, anantgole@ti.com, oliver@hartkopp.net
Subject: Re: linux-next: manual merge of the net tree with the net-current
 tree
From: David Miller <davem@davemloft.net>
In-Reply-To: <20091117131637.3a35f898.sfr@canb.auug.org.au>
References: <20091117131637.3a35f898.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 519
Lines: 14

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 17 Nov 2009 13:16:37 +1100

> I fixed it up (see below) and can carry the fix for a while. (I am not
> sure the fix is entirely correct.)

I'll merge net-2.6 into net-next-2.6 so you won't see this tomorrow.

Thanks!
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/