Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Wed, 13 Jan 2016 19:57:42 +0000 (14:57 -0500)
committerDavid S. Miller <davem@davemloft.net>
Wed, 13 Jan 2016 19:57:42 +0000 (14:57 -0500)
commit4f531b7d7b7f336ce27e829e95be96966bd48fed
treeab74fffe33fb8ebb0b586c99ca2027a80a04ba35
parent3ed2718fea99bbc9d013779b6386b16a9e67c7ce
parent19a3b2f59501bcc3fa9da94913c49375559e9ed8
Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge

Antonio Quartulli says:

====================
net: batman-adv 20160114

Included bugfixes:
- avoid freeing batadv_hardif_neigh_node when still in use in other contexts
- prevent lockdep splat in mcast_free during shutdown
====================

Signed-off-by: David S. Miller <davem@davemloft.net>