Waldemar Brodkorb e1e46622ac Revert "resolve merge" %!s(int64=10) %!d(string=hai) anos
..
pt-initfini.c e1e46622ac Revert "resolve merge" %!s(int64=10) %!d(string=hai) anos
smp.h e1e46622ac Revert "resolve merge" %!s(int64=10) %!d(string=hai) anos
sysdep-cancel.h e1e46622ac Revert "resolve merge" %!s(int64=10) %!d(string=hai) anos
vfork.S e1e46622ac Revert "resolve merge" %!s(int64=10) %!d(string=hai) anos