From mboxrd@z Thu Jan  1 00:00:00 1970
From: Antonio Quartulli <ordex@autistici.org>
Subject: [PATCH 0/2 net-next]: fixups for wrong conflict resolution
Date: Tue, 26 Jun 2012 08:49:49 +0200
Message-ID: <1340693391-16434-1-git-send-email-ordex@autistici.org>
References: <20120625.161933.730861831753419928.davem@davemloft.net>
Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org
To: davem@davemloft.net
Return-path: <netdev-owner@vger.kernel.org>
Received: from investici.nine.ch ([217.150.252.179]:38556 "EHLO
	confino.investici.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1754695Ab2FZGtj (ORCPT
	<rfc822;netdev@vger.kernel.org>); Tue, 26 Jun 2012 02:49:39 -0400
In-Reply-To: <20120625.161933.730861831753419928.davem@davemloft.net>
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

Hello David,

here are our two fixes to recover from the little problems introduced during the
last conflict resolution involving translation-table.c.
Sorry for the inconvenient.

Thank you,
	Antonio