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

batman at open-mesh.org batman at open-mesh.org
Tue Feb 21 00:16:39 CET 2012


The following commit has been merged in the master branch:
commit c51f9c09fabc96f23e449b5e39b1fc4e2cabcd85
Author: Martin Hundebøll <martin at hundeboll.net>
Date:   Thu Dec 8 12:48:26 2011 +0100

    batman-adv: Rm empty line from is_my_mac() in main.c
    
    Signed-off-by: Martin Hundebøll <martin at hundeboll.net>
    Signed-off-by: Marek Lindner <lindner_marek at yahoo.de>

diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index fb87bdc..71b56cf 100644
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
@@ -170,7 +170,6 @@ int is_my_mac(const uint8_t *addr)
 	}
 	rcu_read_unlock();
 	return 0;
-
 }
 
 module_init(batman_init);

-- 
LinuxNextTracking


More information about the linux-merge mailing list