From: Thomas Gleixner <tglx@linutronix.de>
Date: Sat, 29 Aug 2009 08:34:18 +0000 (+0200)
Subject: Merge branch 'timers/posixtimers' into timers/tracing
X-Git-Tag: firefly_0821_release~12448^2~3
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f71bb0ac5e85410601b0db29d7b1635345ea61a4;p=firefly-linux-kernel-4.4.55.git

Merge branch 'timers/posixtimers' into timers/tracing

Merge reason: timer tracepoint patches depend on both branches

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

f71bb0ac5e85410601b0db29d7b1635345ea61a4