Merge pull request #269 from ecsv/batadv-fixes

author Simon Wunderlich <sw@simonwunderlich.de>

Fri, 3 Feb 2017 18:06:32 +0000 (19:06 +0100)

committer GitHub <noreply@github.com>

Fri, 3 Feb 2017 18:06:32 +0000 (19:06 +0100)
author Simon Wunderlich <sw@simonwunderlich.de>
Fri, 3 Feb 2017 18:06:32 +0000 (19:06 +0100)
committer GitHub <noreply@github.com>
Fri, 3 Feb 2017 18:06:32 +0000 (19:06 +0100)
diff --cc batctl/Makefile
Simple merge
diff --cc batman-adv/Makefile
Simple merge
author	Simon Wunderlich <sw@simonwunderlich.de>
	Fri, 3 Feb 2017 18:06:32 +0000 (19:06 +0100)
committer	GitHub <noreply@github.com>
	Fri, 3 Feb 2017 18:06:32 +0000 (19:06 +0100)
		1	2
batctl/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
batman-adv/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history