The following commit has been merged in the merge/master branch: commit 620f45d57203dcc722534b034157fec55df2a606 Author: Marek Lindner lindner_marek@yahoo.de Date: Tue Jun 26 12:00:34 2012 +0200

batman-adv: fix multiline comment complaint

Regression introduced with: a81d0f914409c04cbefafb8b4ccf2de4cc50458f

Signed-off-by: Marek Lindner lindner_marek@yahoo.de

diff --git a/soft-interface.c b/soft-interface.c index e06480a..c77473e 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -385,7 +385,8 @@ struct net_device *batadv_softif_create(const char *name) bat_priv = netdev_priv(soft_iface);

/* batadv_interface_stats() needs to be available as soon as - * register_netdevice() has been called */ + * register_netdevice() has been called + */ bat_priv->bat_counters = __alloc_percpu(cnt_len, __alignof__(uint64_t)); if (!bat_priv->bat_counters) goto free_soft_iface;