Merge branch 'master' of git://rtime.felk.cvut.cz/frescor/frsh_forb/dario

diff --cc resources/cpu_aquosa/lib/aqcpu_fra.c
index 75840e2b28c859efe3d6e3e3ab8bd81140a530f1,343330e96a907bbdf937b1207159bde292bac334..c9acd50f8d4c70561d4eec0dbae1c5af1fb2867a
--- 1/resources/cpu_aquosa/lib/aqcpu_fra.c
--- 2/resources/cpu_aquosa/lib/aqcpu_fra.c
+++ b/resources/cpu_aquosa/lib/aqcpu_fra.c
@@@ -200,9 -207,10 +202,9 @@@ int aqcpu_fra_init(void
        int rv;
  
        if ((qrv = qres_init()) != QOS_OK) {
 -              errno = -EPERM;
                return -1;
        }
-       
+ 
        if ((rv = fra_register(&aqcpu_allocator))) {
                qres_cleanup();
                return rv;