]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 63dc06c a32f192)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorHerbert Xu <herbert@gondor.apana.org.au>
Fri, 25 Apr 2025 02:37:30 +0000 (10:37 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Fri, 25 Apr 2025 02:37:30 +0000 (10:37 +0800)
commit3715cb9863ced462fc1bcc3e1a8444db4b16927c
tree4cfbb89323d79d5fdbe415f3b99c406a97d7e4adtree
parent63dc06cd12f980e304158888485a26ae2be7f371commit | diff
parenta32f1923c6d6e9e727d00558a15ec0af6639de19commit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Merge crypto tree to pick up the scompress scratch refcount fix.  The
merge resolution is slightly non-trivial as the context has shifted.
crypto/scompress.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.