[linux-next] LinuxNextTracking branch, master, updated. next-20110624

batman at open-mesh.org batman at open-mesh.org
Fri Jun 24 16:09:29 CEST 2011

The following commit has been merged in the master branch:
commit 28f8e546e6bc4c2bc6687d7c8dcbe9934cebe639
Author: Marek Lindner <lindner_marek at yahoo.de>
Date:   Mon May 2 16:37:13 2011 +0200

    batman-adv: remove misplaced comment
    Signed-off-by: Marek Lindner <lindner_marek at yahoo.de>
    Signed-off-by: Sven Eckelmann <sven at narfation.org>

diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c
index ef4a9be..51af91b 100644
--- a/net/batman-adv/originator.c
+++ b/net/batman-adv/originator.c
@@ -19,8 +19,6 @@
-/* increase the reference counter for this originator */
 #include "main.h"
 #include "originator.h"
 #include "hash.h"


More information about the linux-merge mailing list