diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2017-08-22 14:53:32 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2017-08-22 14:53:32 +0800 |
| commit | 4be777cec4a84f99aac7f655d638c4c1bc0ade0e (patch) | |
| tree | 065076d19888c1606a664edf3994a951da4c501b /crypto/blkcipher.c | |
| parent | c1b1fa586429a5445ce480ddc75ed76568caef8f (diff) | |
| parent | 4f673910a79f5cb0e7dd87bf807eebb24834cea3 (diff) | |
| download | linux-crypto-4be777cec4a84f99aac7f655d638c4c1bc0ade0e.tar.gz linux-crypto-4be777cec4a84f99aac7f655d638c4c1bc0ade0e.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge the crypto tree to resolve the conflict between the temporary
and long-term fixes in algif_skcipher.
Diffstat (limited to 'crypto/blkcipher.c')
0 files changed, 0 insertions, 0 deletions