Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge

Antonio Quartulli says:

====================
pull request: batman-adv 20160504

In this pull request you have:
- two changes to the MAINTAINERS file where one marks our mailing list
  as moderated and the other adds a missing documentation file
- kernel-doc fixes
- code refactoring and various cleanups
====================

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

diff --cc MAINTAINERS
Simple merge

diff --cc net/batman-adv/bat_v.c
Simple merge

diff --cc net/batman-adv/distributed-arp-table.c
Simple merge

diff --cc net/batman-adv/originator.c
Simple merge

diff --cc net/batman-adv/send.c
Simple merge

diff --cc net/batman-adv/soft-interface.c
Simple merge

diff --cc net/batman-adv/translation-table.c
Simple merge