Merge branch 'master' into scan-test

Conflicts:
	Makefile

diff --cc Makefile
index cc87d6b8a2147c5b84eb26f3578fd2bdffddd9ba,4de66e8945f56d084f5b8a0b178fe2150cae2a0f..7954cd673ebdcd02dcfccd41be02351da169296a
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -13,7 -13,7 +13,7 @@@ CC ?= "gcc
  CFLAGS ?= -O2 -g
  CFLAGS += -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -Werror-implicit-function-declaration
  
- OBJS = iw.o info.o phy.o interface.o station.o util.o mpath.o reg.o mesh.o genl.o scan.o
 -OBJS = iw.o genl.o info.o phy.o interface.o station.o util.o mesh.o mpath.o reg.o
++OBJS = iw.o genl.o info.o phy.o interface.o station.o util.o mesh.o mpath.o scan.o reg.o
  ALL = iw
  
  NL1FOUND := $(shell pkg-config --atleast-version=1 libnl-1 && echo Y)