From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Miller <davem@davemloft.net>
Subject: GIT trees merged...
Date: Sun, 26 Dec 2010 23:19:51 -0800 (PST)
Message-ID: <20101226.231951.104074863.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]:53128
	"EHLO sunset.davemloft.net" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1752108Ab0L0HTV (ORCPT
	<rfc822;netdev@vger.kernel.org>); Mon, 27 Dec 2010 02:19:21 -0500
Received: from localhost (localhost [127.0.0.1])
	by sunset.davemloft.net (Postfix) with ESMTP id 654BD24C087
	for <netdev@vger.kernel.org>; Sun, 26 Dec 2010 23:19:51 -0800 (PST)
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>


I've done a set of Linus --> net-2.6 --> net-next-2.6 GIT tree
merged, mainly to resolve the conflict that existed for
net/ipv4/fib_frontend.c

Just FYI...