Waldemar Brodkorb e1e46622ac Revert "resolve merge" 9 lat temu
..
i686 e1e46622ac Revert "resolve merge" 9 lat temu
pspinlock.c e1e46622ac Revert "resolve merge" 9 lat temu
pt-machine.h e1e46622ac Revert "resolve merge" 9 lat temu
tcb-offsets.sym e1e46622ac Revert "resolve merge" 9 lat temu
tls.h e1e46622ac Revert "resolve merge" 9 lat temu
useldt.h e1e46622ac Revert "resolve merge" 9 lat temu