um: merge tls_{32,64}.h

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>

diff --cc arch/x86/um/shared/sysdep/tls.h
Simple merge

diff --cc arch/x86/um/shared/sysdep/tls_32.h
Simple merge

diff --cc arch/x86/um/shared/sysdep/tls_64.h
Simple merge