um: merge delay_{32,64}.c

Signed-off-by: Richard Weinberger <richard@nod.at>

diff --cc arch/x86/um/Makefile
Simple merge

diff --cc arch/x86/um/delay.c
Simple merge

diff --cc arch/x86/um/delay_64.c
Simple merge