Merge tag 'batadv-net-for-davem-20160914' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Fri, 16 Sep 2016 08:17:33 +0000 (04:17 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 16 Sep 2016 08:17:33 +0000 (04:17 -0400)
Simon Wunderlich says:

====================
Here are two batman-adv bugfix patches:

 - Fix reference counting for last_bonding_candidate, by Sven Eckelmann

 - Fix head room reservation for ELP packets, by Linus Luessing
====================

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

Trivial merge