From: David S. Miller <davem@davemloft.net>
Date: Wed, 4 May 2016 20:21:08 +0000 (-0400)
Subject: Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
X-Git-Tag: v4.7-rc1~154^2~117
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5332174a83720921a5ef6db8080a8691f7ccbc27;p=thirdparty%2Fkernel%2Flinux.git

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

5332174a83720921a5ef6db8080a8691f7ccbc27