um: merge delay_{32,64}.c
commitd0af6cbfa2eb675643cc651114364752e972900b
authorRichard Weinberger <richard@nod.at>
Thu, 18 Aug 2011 19:55:11 +0000 (18 21:55 +0200)
committerRichard Weinberger <richard@nod.at>
Wed, 2 Nov 2011 13:15:37 +0000 (2 14:15 +0100)
treea8ecae20a0c8d709cc655c3c62ccc9b4f7a58e57
parent73395a0002aa9573ffc8d989587b79663847f705
um: merge delay_{32,64}.c

Signed-off-by: Richard Weinberger <richard@nod.at>
arch/x86/um/Makefile
arch/x86/um/delay.c [moved from arch/x86/um/delay_32.c with 100% similarity]
arch/x86/um/delay_64.c [deleted file]