Merge branch 'linus' into timers/core

Reason: Further posix_cpu_timer patches depend on mainline changes

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

diff --cc Documentation/feature-removal-schedule.txt
Simple merge

diff --cc ipc/mqueue.c
Simple merge

diff --cc kernel/posix-cpu-timers.c
Simple merge

diff --cc kernel/time.c
Simple merge

diff --cc kernel/time/timekeeping.c
Simple merge

diff --cc kernel/timer.c
Simple merge