Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Wed, 16 Dec 2015 16:09:40 +0000 (11:09 -0500)
committerDavid S. Miller <davem@davemloft.net>
Wed, 16 Dec 2015 16:09:40 +0000 (11:09 -0500)
commit04ad37836cc132a2127d8a7de340ffbc912b2c7d
treeb4bfac3debd86f270115b7fac431fddbd688b6bf
parent897ca373be8461efc880cc3288ffcbc2e1fa03b0
parent5a1dd8a4773d4c24e925cc6154826d555a85c370
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge

Antonio Quartulli says:

====================
Included changes:
- change my email in MAINTAINERS and Doc files
- create and export list of single hop neighs per interface
- protect CRC in the BLA code by means of its own lock
- minor fixes and code cleanups
====================

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