Merge tag 'batadv-net-for-davem-20190830' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Sat, 31 Aug 2019 20:16:07 +0000 (13:16 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 31 Aug 2019 20:16:07 +0000 (13:16 -0700)
Simon Wunderlich says:

====================
Here are two batman-adv bugfixes:

 - Fix OGM and OGMv2 header read boundary check,
   by Sven Eckelmann (2 patches)
====================

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

Trivial merge