]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2e409dc e377c31)
Merge remote-tracking branch 'keys/keys-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Jun 2021 03:41:44 +0000 (13:41 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Jun 2021 03:41:44 +0000 (13:41 +1000)
# Conflicts:
# certs/system_keyring.c


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.