Merge branch 'timers/posixtimers' into timers/tracing

Merge reason: timer tracepoint patches depend on both branches

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

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

diff --cc kernel/fork.c
Simple merge

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