diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-13 23:17:39 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-13 23:17:39 +0100 |
commit | 64ae1342f8980d05c3df414a022b8123aa76c56b (patch) | |
tree | 12b208c5811a699c18b2fc67e9a1f61d65febca2 /crypto/essiv.c | |
parent | linux/pipe_fs_i.h: fix kernel-doc warnings after @wait was split (diff) | |
parent | crypto: Kconfig - allow tests to be disabled when manager is disabled (diff) | |
download | linux-64ae1342f8980d05c3df414a022b8123aa76c56b.tar.xz linux-64ae1342f8980d05c3df414a022b8123aa76c56b.zip |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fix from Herbert Xu:
"This fixes a Kconfig anomaly when lib/crypto is enabled without Crypto
API"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: Kconfig - allow tests to be disabled when manager is disabled
Diffstat (limited to 'crypto/essiv.c')
0 files changed, 0 insertions, 0 deletions