From: Vinod Koul <vinod.koul@intel.com>
Date: Tue, 14 Nov 2017 05:07:18 +0000 (+0530)
Subject: Merge branch 'topic/timer_api' into for-linus
X-Git-Tag: v4.15-rc1~122^2~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=40b4ed1a1a214d9da3db0298b2079103a9a7e32a;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'topic/timer_api' into for-linus
---

40b4ed1a1a214d9da3db0298b2079103a9a7e32a