From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Miller <davem@davemloft.net>
Subject: Re: pull request: batman-adv 2011-12-07
Date: Wed, 07 Dec 2011 15:07:16 -0500 (EST)
Message-ID: <20111207.150716.570415213420429511.davem@davemloft.net>
References: <1323236203-24711-1-git-send-email-lindner_marek@yahoo.de>
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: lindner_marek@yahoo.de
Return-path: <netdev-owner@vger.kernel.org>
Received: from shards.monkeyblade.net ([198.137.202.13]:47403 "EHLO
	shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1756773Ab1LGUIV (ORCPT
	<rfc822;netdev@vger.kernel.org>); Wed, 7 Dec 2011 15:08:21 -0500
In-Reply-To: <1323236203-24711-1-git-send-email-lindner_marek@yahoo.de>
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

From: Marek Lindner <lindner_marek@yahoo.de>
Date: Wed,  7 Dec 2011 13:36:40 +0800

> The following changes since commit 1ea6b8f48918282bdca0b32a34095504ee65bab5:
> 
>   Linux 3.2-rc1 (2011-11-07 16:16:02 -0800)
> 
> are available in the git repository at:
>   git://git.open-mesh.org/linux-merge.git batman-adv/maint
> 
> Antonio Quartulli (2):
>       batman-adv: in case of roaming mark the client with TT_CLIENT_ROAM
>       batman-adv: delete global entry in case of roaming

Pulled, thanks.

And also thanks for the heads-up about the conflicts.