Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
authorHerbert Xu <herbert@gondor.apana.org.au>
Fri, 3 Nov 2017 14:10:18 +0000 (22:10 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Fri, 3 Nov 2017 14:10:18 +0000 (22:10 +0800)
Merge 4.14-rc3 in order to pick up the new timer_setup function.

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge