Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Fri, 28 Aug 2015 20:43:33 +0000 (13:43 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 28 Aug 2015 20:43:33 +0000 (13:43 -0700)
Antonio Quartulli says:

====================
Included changes:
- code beautification
- remove obsolete 'deleted' attribute for bat-gw node
- increase internal version number
- prevent potential access to netdev object after deregistration
- set needed_head/tail_room for batman virtual interface
====================

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

Trivial merge