Merge branch 'batman-adv/maint' of git://git.open-mesh.org/linux-merge