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)
commit5908064a0beb074b637df1e865c1f0738157ce8e
treed3c6d7044e43fd23da539664011cb7c35bd9ea7a
parent058c8d59124193f46db4efa5abcd9d6d0f04c88e
parent40b16b9be5773a314948656c96adf7bf7cfdbd0b
Merge tag 'batadv-next-for-davem-20171023' of git://git.open-mesh.org/linux-merge

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>