projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fccff08 5ba7dcf)
Merge tag 'batadv-net-for-davem-20171215' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Fri, 15 Dec 2017 16:02:11 +0000 (11:02 -0500)
committerDavid S. Miller <davem@davemloft.net>
Fri, 15 Dec 2017 16:02:11 +0000 (11:02 -0500)
Simon Wunderlich says:

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

 - Initialize the fragment headers, by Sven Eckelmann

 - Fix a NULL check in BATMAN V, by Sven Eckelmann

 - Fix kernel doc for the time_setup() change, by Sven Eckelmann

 - Use the right lock in BATMAN IV OGM Update, by Sven Eckelmann
====================

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

Trivial merge
John Crispins staging tree