Waldemar Brodkorb e1e46622ac Revert "resolve merge" %!s(int64=9) %!d(string=hai) anos
..
pspinlock.c e1e46622ac Revert "resolve merge" %!s(int64=9) %!d(string=hai) anos
pt-machine.h e1e46622ac Revert "resolve merge" %!s(int64=9) %!d(string=hai) anos
tcb-offsets.sym e1e46622ac Revert "resolve merge" %!s(int64=9) %!d(string=hai) anos
tls.h 266bdc1f62 Replace FSF snail mail address with URLs %!s(int64=11) %!d(string=hai) anos