Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Tue, 23 Feb 2016 19:49:17 +0000 (14:49 -0500)
committerDavid S. Miller <davem@davemloft.net>
Tue, 23 Feb 2016 19:49:17 +0000 (14:49 -0500)
commit9b69d206302b05b49d8b2ef12f78722952672c22
tree0123b4a9afb33b8e22b967812c8e9d2a9d4746b1
parenta30a9ea6e21b495372aff549f3dfd63198bd1f45
parent7e2366c6267d4ea257c4d0deb2fcf0744749de5f
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge

Antonio Quartulli says:

====================
pull request [net-next]: batman-adv 20160223

This is a cleanup patchset: first the BATADV_BONDING_TQ_THRESHOLD
constant gets removed as it was defined but not used anywhere,
then all our *_free_ref functions are renamed to *_put in order
to follow the kernel naming convention by Sven Eckelmann.
====================

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