Re: [B.A.T.M.A.N.] [PATCH 2/6] batman-adv: Detect coding nodes and remove these after timeout

Sven Eckelmann
2012-11-30T15:39:46Z

[-- Attachment #1: Type: text/plain, Size: 295 bytes --]

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

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

Kind regards,
Sven

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]