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.