From: Ingo Molnar <mingo@kernel.org>
Date: Tue, 31 Jul 2012 15:05:27 +0000 (+0200)
Subject: Merge branch 'linus' into timers/urgent
X-Git-Tag: firefly_0821_release~3680^2~2250^2~5
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1f815faec46e83bc96039797151846b60875bb06;p=firefly-linux-kernel-4.4.55.git

Merge branch 'linus' into timers/urgent

Merge in Linus's branch which already has timers/core merged.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

1f815faec46e83bc96039797151846b60875bb06