Fix on MAC setting in NVS file

Many HW platform will not allow accessing unsigned int values in odd
addresses, so you should pass to a sscanf with %x format a pointer to
a unsigned int value.  Bug detected on a Samsung's S3C2416 based
platform.

Signed-off-by: José Miguel Gonçalves <jose.goncalves@inov.pt>
Signed-off-by: Luciano Coelho <coelho@ti.com>
fix scan configuration mismatch, and change version

the upstream code uses min(max)_dwell_time/min(max)_dwell_time_long
instead of the current min(max)_dwell_time_conc/min(max)_dwell_time
(the meaning the standard dwell_time was changed).

update conf.h accordingly, and update the version as well.

Signed-off-by: Eliad Peller <eliad@wizery.com>
Merge branch 'upstream'