summaryrefslogtreecommitdiffstats
path: root/crypto/userspace/libtomcrypt/hashes/hash_memory.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'standalone-master' into standalone-renameMiloslav Trmač2010-08-271-1/+1
| | | | | | | | | | | | Conflicts: TODO crypto.4 examples/Makefile examples/ncr.c examples/pk.c examples/speed.c include/linux/cryptodev.h userspace/setkey.c
* Merge branch 'standalone-master' into standalone-renameMiloslav Trmač2010-07-261-9/+7
| | | | | | | | | | | | Conflicts: crypto/userspace/ncr-data.c crypto/userspace/ncr_int.h examples/Makefile examples/ncr.c examples/pk.c examples/speed.c ncr-int.h ncr_int.h
* Rename/delete files to fit into the kernel.Miloslav Trmač2010-07-221-0/+68
No files are modified in this commit - this is a "bridge" for allowing merges between standalone and integrated work.