Merge reason: timer tracepoint patches depend on both branches
Signed-off-by: NThomas Gleixner <tglx@linutronix.de>