]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d725332 f858c7b)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorHerbert Xu <herbert@gondor.apana.org.au>
Thu, 28 May 2015 03:16:41 +0000 (11:16 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Thu, 28 May 2015 03:16:41 +0000 (11:16 +0800)
Merge the crypto tree for 4.1 to pull in the changeset that disables
algif_aead.

1  2 
crypto/Kconfig patch | diff1 | diff2 | blob | history
crypto/algif_aead.c patch | diff1 | diff2 | blob | history
drivers/crypto/Kconfig patch | diff1 | diff2 | blob | history

diff --cc crypto/Kconfig
Simple merge
diff --cc crypto/algif_aead.c
Simple merge
diff --cc drivers/crypto/Kconfig
Simple merge
Unnamed repository; edit this file 'description' to name the repository.