um/x86: merge 32 and 64 bit variants of ptrace.h

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

diff --cc arch/x86/um/asm/ptrace.h
Simple merge

diff --cc arch/x86/um/asm/ptrace_32.h
Simple merge

diff --cc arch/x86/um/asm/ptrace_64.h
Simple merge