diff options
| author | Jens Axboe | 2017-11-15 08:15:50 -0700 |
|---|---|---|
| committer | Jens Axboe | 2017-11-15 08:15:50 -0700 |
| commit | 4358a844fc9f9db7e826b1dfd312af89f9e3c039 (patch) | |
| tree | 96e986c6c8dd214af5eba61a1a26d70f2237d402 /security/selinux/netlabel.c | |
| parent | a33801e8b4735b8d473f963e5854172f9cde3e8b (diff) | |
| parent | 8376d3c1f98988ae7f9e9bc2d1eeeb7d61fd206c (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
Diffstat (limited to 'security/selinux/netlabel.c')
0 files changed, 0 insertions, 0 deletions