Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Sun, 10 Jan 2016 02:48:36 +0000 (21:48 -0500)
committerDavid S. Miller <davem@davemloft.net>
Sun, 10 Jan 2016 02:48:36 +0000 (21:48 -0500)
commitc9c99311b55d4765cae35c652cb637747cc637b7
tree3c83b06ded659f8143e7f0ba49babf1999010463
parent12f1501e7511958b3a7244e24f290803d0a3c41f
parented21d170e878b6b067a3216040b7b935c8007196
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge

Antonio Quartulli says:

====================
Included changes:
- increase internal module version
- increase BLA wait periods to 6
- purge BLA backbone table when it is disabled
- make sure post function is invoked only if sysfs value is changed
- simplify code by removing useless NULL checks
- various corrections to existing kerneldoc
- minor cleanups
====================

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