diff options
| author | James Morris <james.l.morris@oracle.com> | 2017-11-24 11:54:11 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2017-11-24 11:54:11 +1100 |
| commit | 65cb3654889e0b748abc7756260ca267705aee14 (patch) | |
| tree | 7aef00d973ddaeace8916dca0d2a5b5b33cd28de /crypto/af_alg.c | |
| parent | 64144cc773c0c9168ae5a49f1c2928f7498d4f57 (diff) | |
| parent | 484a3151473c059d44f33a89811c97914a070c74 (diff) | |
| download | linux-crypto-65cb3654889e0b748abc7756260ca267705aee14.tar.gz linux-crypto-65cb3654889e0b748abc7756260ca267705aee14.zip | |
Merge tag 'keys-next-20171123' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next-keys
Merge keys subsystem changes from David Howells, for v4.15.
Diffstat (limited to 'crypto/af_alg.c')
0 files changed, 0 insertions, 0 deletions