From: David S. Miller <davem@davemloft.net>
Date: Wed, 16 Dec 2015 16:09:40 +0000 (-0500)
Subject: Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
X-Git-Tag: v4.5-rc1~128^2~130
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=04ad37836cc132a2127d8a7de340ffbc912b2c7d;p=karo-tx-linux.git

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>
---

04ad37836cc132a2127d8a7de340ffbc912b2c7d