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