From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Fri, 3 Nov 2017 14:10:18 +0000 (+0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
X-Git-Tag: v4.15-rc1~139^2~48
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=ab387f0af24e661fc1c2f609664ec9ae6618e3f0;p=linux-block.git

Merge git://git./linux/kernel/git/torvalds/linux

Merge 4.14-rc3 in order to pick up the new timer_setup function.
---

ab387f0af24e661fc1c2f609664ec9ae6618e3f0