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

batman at open-mesh.org batman at open-mesh.org
Wed Sep 5 00:17:20 CEST 2012

The following commit has been merged in the master branch:
commit c70437289c989d865633486fc24c61441ba32b9e
Author: Antonio Quartulli <ordex at autistici.org>
Date:   Wed Aug 22 00:42:40 2012 +0200

    batman-adv: move function arguments on one line
    Signed-off-by: Antonio Quartulli <ordex at autistici.org>

diff --git a/net/batman-adv/bridge_loop_avoidance.h b/net/batman-adv/bridge_loop_avoidance.h
index 563cfbf..3f0dfa2 100644
--- a/net/batman-adv/bridge_loop_avoidance.h
+++ b/net/batman-adv/bridge_loop_avoidance.h
@@ -41,8 +41,7 @@ void batadv_bla_free(struct batadv_priv *bat_priv);
 #else /* ifdef CONFIG_BATMAN_ADV_BLA */
 static inline int batadv_bla_rx(struct batadv_priv *bat_priv,
-				struct sk_buff *skb, short vid,
-				bool is_bcast)
+				struct sk_buff *skb, short vid, bool is_bcast)
 	return 0;


More information about the linux-merge mailing list