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 6d550ddd12 sparc: remove sparc64/sparcv9 code %!s(int64=10) %!d(string=hai) anos
tcb-offsets.sym e1e46622ac Revert "resolve merge" %!s(int64=9) %!d(string=hai) anos
tls.h e1e46622ac Revert "resolve merge" %!s(int64=9) %!d(string=hai) anos