The following commit has been merged in the master branch: commit 0a4dd0d7868aa8e8b84a5d4ddb50fa0391709b5f Author: Jean Sacren sakiwit@gmail.com Date: Thu Aug 7 06:50:46 2014 -0600

batman: fix duplicate #include of multicast.h

The header multicast.h was included twice, so delete one of them.

Signed-off-by: Jean Sacren sakiwit@gmail.com Cc: Marek Lindner mareklindner@neomailbox.ch Cc: Simon Wunderlich sw@simonwunderlich.de Cc: Antonio Quartulli antonio@meshcoding.com Cc: b.a.t.m.a.n@lists.open-mesh.org Signed-off-by: David S. Miller davem@davemloft.net

diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index 96b66fd..ab6bb2a 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -20,7 +20,6 @@ #include "originator.h" #include "hard-interface.h" #include "translation-table.h" -#include "multicast.h"

/** * batadv_mcast_mla_softif_get - get softif multicast listeners