summaryrefslogtreecommitdiffstats
path: root/security/keys/keyring.c
diff options
context:
space:
mode:
authorThomas Gleixner2019-01-15 16:35:14 +0100
committerThomas Gleixner2019-01-15 16:35:14 +0100
commitb17d1ce7efe21e075dace85658d26d354766b443 (patch)
tree97bce6e52c417120c2ca9e5c09d966a6f49bbb22 /security/keys/keyring.c
parenttime: Move CONTEXT_TRACKING to kernel/time/Kconfig (diff)
parentposix-cpu-timers: Unbreak timer rearming (diff)
downloadkernel-qcow2-linux-b17d1ce7efe21e075dace85658d26d354766b443.tar.gz
kernel-qcow2-linux-b17d1ce7efe21e075dace85658d26d354766b443.tar.xz
kernel-qcow2-linux-b17d1ce7efe21e075dace85658d26d354766b443.zip
Merge branch 'timers/urgent' into timers/core
Merge urgent fix so depending cleanup patch can be applied.
Diffstat (limited to 'security/keys/keyring.c')
0 files changed, 0 insertions, 0 deletions