From: David S. Miller <davem@davemloft.net>
Date: Sun, 10 Jan 2016 02:48:36 +0000 (-0500)
Subject: Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
X-Git-Tag: v4.5-rc1~128^2~39
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c9c9931;p=karo-tx-linux.git

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>
---

c9c99311b55d4765cae35c652cb637747cc637b7