Merge branch 'master' into scan-test

Conflicts:
	nl80211.h

diff --cc Makefile
Simple merge

diff --cc info.c
Simple merge

diff --cc nl80211.h
index 1f9a927917c1f9712b23488f57231494ff978137,4bc27049f4e5736bb7d77b0c4fa947d975314c6c..8802d1bda382a1d674ce1ae29cf6f84fc1bb0cf3
--- 1/nl80211.h
--- 2/nl80211.h
+++ b/nl80211.h
@@@ -195,11 -190,8 +197,13 @@@ enum nl80211_commands 
  
        NL80211_CMD_SET_MGMT_EXTRA_IE,
  
+       NL80211_CMD_GET_REG,
+ 
 +      NL80211_CMD_GET_SCAN,
 +      NL80211_CMD_TRIGGER_SCAN,
 +      NL80211_CMD_NEW_SCAN_RESULTS,
 +      NL80211_CMD_SCAN_ABORTED,
 +
        /* add new commands above here */
  
        /* used to define NL80211_CMD_MAX below */