Merge tag 'batadv-net-for-davem-20161202' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Sat, 3 Dec 2016 21:13:27 +0000 (16:13 -0500)
committerDavid S. Miller <davem@davemloft.net>
Sat, 3 Dec 2016 21:13:27 +0000 (16:13 -0500)
commita38b61009425b3882704270e792a6e743f5d9426
treed19b50d283f5fb3d0e3d63160aa8ce0981163f36
parent8dc0f265d39a3933f4c1f846c7c694f12a2ab88a
parentc2d0f48a13e53b4747704c9e692f5e765e52041a
Merge tag 'batadv-net-for-davem-20161202' of git://git.open-mesh.org/linux-merge

Simon Wunderlich says:

====================
Here is another batman-adv bugfix:

 - fix checking for failed allocation of TVLV blocks in TT local data,
   by Sven Eckelmann
====================

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