kernel-crypto.git - User-space crypto API development for Linux

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'standalone-master' into standalone-renamencr-standalone-rename	Miloslav Trmač	2010-09-06	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: crypto/userspace/libtomcrypt/misc/qsort.c crypto/userspace/libtommath/bn_mp_and.c crypto/userspace/libtommath/bn_mp_exteuclid.c crypto/userspace/libtommath/bn_mp_jacobi.c crypto/userspace/libtommath/bn_mp_or.c crypto/userspace/libtommath/bn_mp_prime_fermat.c crypto/userspace/libtommath/bn_mp_radix_size.c crypto/userspace/libtommath/bn_mp_radix_smap.c crypto/userspace/libtommath/bn_mp_read_radix.c crypto/userspace/libtommath/bn_mp_sqrt.c crypto/userspace/libtommath/bn_mp_toradix.c crypto/userspace/libtommath/bn_mp_toradix_n.c crypto/userspace/libtommath/bn_mp_xor.c examples/Makefile examples/ncr.c examples/pk.c
*	Merge branch 'standalone-master' into standalone-rename	Miloslav Trmač	2010-08-27	2	-363/+180
\| \| \| \| \| \| \| \| \| \| \| \|	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-rename	Miloslav Trmač	2010-08-08	2	-48/+49
\| \| \| \| \| \| \| \| \|	Conflicts: examples/cipher.c examples/hmac.c examples/ncr.c examples/pk.c userspace/setkey.c
*	Merge branch 'standalone-master' into standalone-rename	Miloslav Trmač	2010-08-05	1	-2/+2
\|
*	Merge branch 'standalone-master' into standalone-rename	Miloslav Trmač	2010-07-31	1	-2/+1
\| \| \| \| \| \| \| \|	Conflicts: AUTHORS README TODO userspace/setkey.c
*	Merge branch 'standalone-master' into standalone-rename	Miloslav Trmač	2010-07-27	1	-7/+23
\| \| \| \| \| \|	Conflicts: COPYING examples/pk.c
*	Merge branch 'standalone-master' into standalone-rename	Miloslav Trmač	2010-07-26	1	-46/+31
\| \| \| \| \| \| \| \| \| \| \| \|	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
*	Merge branch 'standalone-master' into standalone-rename	Miloslav Trmač	2010-07-23	1	-19/+17
\| \| \| \| \| \| \| \|	Conflicts: examples/Makefile examples/ncr.c examples/pk.c examples/speed.c
*	Rename/delete files to fit into the kernel.	Miloslav Trmač	2010-07-22	2	-0/+472
	No files are modified in this commit - this is a "bridge" for allowing merges between standalone and integrated work.