]> 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: 25cee3a e377c31)
Merge remote-tracking branch 'keys/keys-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 May 2021 00:07:42 +0000 (10:07 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 May 2021 00:07:42 +0000 (10:07 +1000)
# Conflicts:
# certs/system_keyring.c


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