git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a33801e 8376d3c)
Merge branch 'for-4.15/timer' into for-linus
authorJens Axboe <axboe@kernel.dk>
Wed, 15 Nov 2017 15:15:50 +0000 (08:15 -0700)
committerJens Axboe <axboe@kernel.dk>
Wed, 15 Nov 2017 15:15:50 +0000 (08:15 -0700)
commit4358a844fc9f9db7e826b1dfd312af89f9e3c039
tree96e986c6c8dd214af5eba61a1a26d70f2237d402tree
parenta33801e8b4735b8d473f963e5854172f9cde3e8bcommit | diff
parent8376d3c1f98988ae7f9e9bc2d1eeeb7d61fd206ccommit | diff
Merge branch 'for-4.15/timer' into for-linus

Post initial pull timer related changes for block drivers. Not merged
with the first pull, since they were dependent on this commit in
mainline:

commit 686fef928bba6be13cabe639f154af7d72b63120
Author: Kees Cook <keescook@chromium.org>
Date:   Thu Sep 28 06:38:17 2017 -0700

    timer: Prepare to change timer callback argument type
Unnamed repository; edit this file 'description' to name the repository.