diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-08-05 19:12:53 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-08-05 19:12:53 +0200 |
| commit | e7f1c4b12cbb143e9b6d1cdd0f1ec9a7725b4cac (patch) | |
| tree | f85423e39a43c2fd768e8d3a63d527abe5548ad9 /crypto/userspace/libtomcrypt/headers/tomcrypt_pk.h | |
| parent | b7d119a04244fd17aa69e4f4f4e8a33cc60d1090 (diff) | |
| parent | 7494e29338fedcfeb5ed1e31eefe5742b786a2be (diff) | |
| download | kernel-crypto-e7f1c4b12cbb143e9b6d1cdd0f1ec9a7725b4cac.tar.gz kernel-crypto-e7f1c4b12cbb143e9b6d1cdd0f1ec9a7725b4cac.tar.xz kernel-crypto-e7f1c4b12cbb143e9b6d1cdd0f1ec9a7725b4cac.zip | |
Merge branch 'standalone-rename' into userspace-crypto
Conflicts:
crypto/userspace/ncr-dh.c
crypto/userspace/ncr-key-storage.c
crypto/userspace/ncr-key-wrap.c
crypto/userspace/ncr-key.c
crypto/userspace/ncr-limits.c
crypto/userspace/ncr-pk.c
Diffstat (limited to 'crypto/userspace/libtomcrypt/headers/tomcrypt_pk.h')
0 files changed, 0 insertions, 0 deletions