]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge remote-tracking branch 'keys/keys-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 04:36:02 +0000 (14:36 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 04:36:02 +0000 (14:36 +1000)
commitbdc522744d3b71861feda853fbf729cee26aa5e6
tree75cc3396a89504b5e4c7c38faf3ed7d58b6f45ae
parent153aee0a7c25d8d320dd867ed2231833665f5fd9
parente377c31f788fc98815e1ab90b5a35704ce35843a
Merge remote-tracking branch 'keys/keys-next'

# Conflicts:
# certs/system_keyring.c
certs/Kconfig
certs/Makefile
certs/system_keyring.c
include/keys/system_keyring.h
scripts/Makefile