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

net/batman-adv/icmp_socket.c

net/batman-adv/icmp_socket.h

net/batman-adv/main.c

net/batman-adv/routing.c

net/batman-adv/routing.h

net/batman-adv/send.c

net/batman-adv/send.h

net/batman-adv/soft-interface.c

net/batman-adv/translation-table.c

net/batman-adv/translation-table.h

net/batman-adv/unicast.c