The following commit has been merged in the master branch: commit a7528f8ddda9fba061148e18e71761b50b1c6d26 Author: Antonio Quartulli ordex@autistici.org Date: Sun Sep 2 19:00:38 2012 +0200

batman-adv: fix wrong spinlock inline comment

Signed-off-by: Antonio Quartulli ordex@autistici.org

diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 8ce16c1..e8a1b18 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -303,7 +303,7 @@ struct batadv_priv { struct hlist_head forw_bcast_list; struct batadv_hashtable *orig_hash; spinlock_t forw_bat_list_lock; /* protects forw_bat_list */ - spinlock_t forw_bcast_list_lock; /* protects */ + spinlock_t forw_bcast_list_lock; /* protects forw_bcast_list */ struct delayed_work orig_work; struct batadv_hard_iface __rcu *primary_if; /* rcu protected pointer */ struct batadv_algo_ops *bat_algo_ops;