diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2015-07-14 14:55:32 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2015-07-14 14:55:32 +0800 |
| commit | 773bb50625cd23c7711bcd1410fffe8a0cab121b (patch) | |
| tree | 5153fb0cfa8c29666ef3f997b95378dbf55983fc /crypto/algapi.c | |
| parent | 1425d2d17f7309c65e2bd124e0ce8ace743b17f2 (diff) | |
| parent | 030f4e968741d65aea9cd5f7814d1164967801ef (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge the crypto tree to pull in the nx reentrancy patch.
Diffstat (limited to 'crypto/algapi.c')
0 files changed, 0 insertions, 0 deletions