um: merge Makefile-{i386,x86_64}
commit7bbe7204e93734fe79d8aac3e08a7cb4624b5004
authorAl Viro <viro@ftp.linux.org.uk>
Thu, 18 Aug 2011 19:06:29 +0000 (18 20:06 +0100)
committerRichard Weinberger <richard@nod.at>
Wed, 2 Nov 2011 13:15:04 +0000 (2 14:15 +0100)
treeaef04472a8f1fa0e6cc43916b8f9165bceb753a0
parenta6e77d6c74fa82675b087a79c8a145cae7c58f36
um: merge Makefile-{i386,x86_64}

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
arch/um/Makefile
arch/um/Makefile-x86 [moved from arch/um/Makefile-i386 with 70% similarity]
arch/um/Makefile-x86_64 [deleted file]