From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Miller <davem@davemloft.net>
Subject: Re: pull request: batman-adv 2013-10-09b
Date: Wed, 09 Oct 2013 15:56:58 -0400 (EDT)
Message-ID: <20131009.155658.131342560291162660.davem@davemloft.net>
References: <1381347174-3629-1-git-send-email-antonio@meshcoding.com>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org
To: antonio@meshcoding.com
Return-path: <netdev-owner@vger.kernel.org>
Received: from shards.monkeyblade.net ([149.20.54.216]:51771 "EHLO
	shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751798Ab3JIT5A (ORCPT
	<rfc822;netdev@vger.kernel.org>); Wed, 9 Oct 2013 15:57:00 -0400
In-Reply-To: <1381347174-3629-1-git-send-email-antonio@meshcoding.com>
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

From: Antonio Quartulli <antonio@meshcoding.com>
Date: Wed,  9 Oct 2013 21:32:38 +0200

> here you have my fixed pull request intended for net-next.
> 
> The previous build error was due to an accidental remotion of the beginning of a
> batadv_dbg() statement during a merge conflict resolution.
> Sorry for that.

This looks better, pulled, thanks a lot.