ARM: OMAP: Undo next_timer_interrupt() fix for hrtimer

Undo patch bd9dac303a140c324ebcefaa799622637c6928eb as a
better patch is now available.

diff --cc include/linux/hrtimer.h
Simple merge

diff --cc kernel/hrtimer.c
Simple merge

diff --cc kernel/timer.c
Simple merge