x86: Replace the now identical time_32/64.c by time.c

Remove the redundant copy.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

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

diff --cc arch/x86/kernel/time.c
Simple merge

diff --cc arch/x86/kernel/time_64.c
Simple merge