um: merge skas_ptrace.h 32/64bit variants
authorAl Viro <viro@ftp.linux.org.uk>
Thu, 18 Aug 2011 19:05:49 +0000 (20:05 +0100)
committerRichard Weinberger <richard@nod.at>
Wed, 2 Nov 2011 13:15:01 +0000 (14:15 +0100)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
arch/um/sys-x86/shared/sysdep/skas_ptrace.h
arch/um/sys-x86/shared/sysdep/skas_ptrace_32.h [deleted file]
arch/um/sys-x86/shared/sysdep/skas_ptrace_64.h [deleted file]

diff --cc arch/um/sys-x86/shared/sysdep/skas_ptrace_32.h
Simple merge
diff --cc arch/um/sys-x86/shared/sysdep/skas_ptrace_64.h
Simple merge