From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <sven@narfation.org>
From: Sven Eckelmann <sven@narfation.org>
Date: Fri, 30 Nov 2012 16:39:46 +0100
Message-ID: <6805886.t8ZOUf2Ty6@bentobox>
In-Reply-To: <be77d51107acf2b1063534bac509bb2330c2b7d2.1354287613.git.martin@hundeboll.net>
References: <cover.1354287613.git.martin@hundeboll.net>
 <be77d51107acf2b1063534bac509bb2330c2b7d2.1354287613.git.martin@hundeboll.net>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="nextPart1775363.433mcVKHyu";
 micalg="pgp-sha512"; protocol="application/pgp-signature"
Content-Transfer-Encoding: quoted-printable
Subject: Re: [B.A.T.M.A.N.] [PATCH 2/6] batman-adv: Detect coding nodes and
	remove these after timeout
Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking
 <b.a.t.m.a.n@lists.open-mesh.org>
List-Id: The list for a Better Approach To Mobile Ad-hoc Networking
 <b.a.t.m.a.n.lists.open-mesh.org>
List-Unsubscribe: <https://lists.open-mesh.org/mm/options/b.a.t.m.a.n>,
 <mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=unsubscribe>
List-Archive: <http://lists.open-mesh.org/pipermail/b.a.t.m.a.n/>
List-Post: <mailto:b.a.t.m.a.n@lists.open-mesh.org>
List-Help: <mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=help>
List-Subscribe: <https://lists.open-mesh.org/mm/listinfo/b.a.t.m.a.n>,
 <mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=subscribe>
To: b.a.t.m.a.n@lists.open-mesh.org
Cc: Martin =?ISO-8859-1?Q?Hundeb=F8ll?= <martin@hundeboll.net>


--nextPart1775363.433mcVKHyu
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset="iso-8859-1"

On Friday 30 November 2012 16:08:31 Martin Hundeb=F8ll wrote:
> +<<<<<<< HEAD
> +=3D=3D=3D=3D=3D=3D=3D
> + * batadv_can_nc_with_orig - checks whether the given orig node is s=
uitable
> for + *  coding or not
> + * @bat_priv:

Sry, I dont think we need merge conflicts in KernelDoc.

Kind regards,
=09Sven
--nextPart1775363.433mcVKHyu
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: This is a digitally signed message part.

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAABCgAGBQJQuNNCAAoJEF2HCgfBJntGyDsP/3+2NMywMvONquccVnjBw/ic
LUfLM3ZiEFEKiUwdNky7AkXuTEJE9l9Xk5Mxv79blR5cAaEow+wqsmNn2qYi7LTn
Ewxc5iAZLXphIXlpN6u6uplGxZ1QkMyvQXXR6UdjkVpZJJ4fmXQlTfL0y+MmiaCG
e3hD5HFxMTROvD4IJhkfk44pqJL0lPLID4kCI7g/n1oMS3u4G588VOcT8GNc75WM
asy3fjKBi6FttuzYgiJ5t1LxcteDN75nA3lAbfA8RsMBjjQRjaoJHZhmD0kysuph
NBy/R58OFZ5bZ3jy3ZJOs48Kg6D9ATKoLUDByjmQA3kJoiiGa44NJrfRHgXAXysu
AEpbip7na9drFP13j8cnZ00HAWsEGTLtGUvqAz+egh62QHWzaRg/yeyQFofuy0SD
2shUozetnu+kF9pY7ABdNEcnqiwDdkxptlg/JFhTPl5jlxo9KhD10iUX4PLAYLaE
NhyhaIHyZm3jV4ctUWfB0dAvfY/U97Lc1mDH9zNOVUrxxv11dUEYCCf7nXPddFsZ
HRkYOmvxn9quQET6Cbg3ZLuO3y08xBoMvbKk0RwaAgY8bKMJYx/EZ0fK8Sxmm9i/
aPvXM8giw8HdTciz/YiUicpT3C58w70ks7TYLz5GwZ+LCQve8po+1CS3s7euxrT9
fvrI2hyVB9kSHHIkTE0m
=UULE
-----END PGP SIGNATURE-----

--nextPart1775363.433mcVKHyu--