Staging: batman-adv: remove redundant pointer to originator interface

Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --cc drivers/staging/batman-adv/device.c
Simple merge

diff --cc drivers/staging/batman-adv/originator.c
Simple merge

diff --cc drivers/staging/batman-adv/routing.c
Simple merge

diff --cc drivers/staging/batman-adv/soft-interface.c
Simple merge

diff --cc drivers/staging/batman-adv/types.h
Simple merge

diff --cc drivers/staging/batman-adv/vis.c
Simple merge