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)
commit6777ae8083f132baa4270f40e31776274f989a07
tree251f7d000c62978612ab062880cafe5b2b1d3830
parent2a292822f00f7409fc0bd6b2d09efc5b8e6c9c5d
parent1e5d343b8f23770e8ac5d31f5c439826bdb35148
Merge tag 'batadv-net-for-davem-20160914' of git://git.open-mesh.org/linux-merge

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>