Merge branch 'linus' into timers/core

Reason: Martin's timekeeping cleanup series depends on both
timers/core and mainline changes.

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

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

diff --cc kernel/hrtimer.c
Simple merge

diff --cc kernel/timer.c
Simple merge