Merge remote-tracking branch 'OE-2.1/master' into vuplus-3.0
[vuplus_openvuplus_3.0] / meta-bsp / vusolose / conf / machine /
drwxr-xr-x   ..
-rw-r--r-- 813 vusolose.conf