Merge tag 'batadv-next-for-davem-20171023' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Tue, 24 Oct 2017 00:15:03 +0000 (01:15 +0100)
committerDavid S. Miller <davem@davemloft.net>
Tue, 24 Oct 2017 00:15:03 +0000 (01:15 +0100)
Simon Wunderlich says:

====================
This documentation/cleanup patchset includes the following patches:

 - Fix parameter kerneldoc which caused kerneldoc warnings, by Sven Eckelmann

 - Remove spurious warnings in B.A.T.M.A.N. V neighbor comparison,
   by Sven Eckelmann

 - Use inline kernel-doc style for UAPI constants, by Sven Eckelmann
====================

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

Trivial merge