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	30	-1209/+705
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	21	-1783/+2090
\| \| \| \| \| \| \| \| \| \| \| \|	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-23	30	-28/+24
\|
*	Merge branch 'standalone-master' into standalone-rename	Miloslav Trmač	2010-08-20	4	-6/+4
\|
*	Merge branch 'standalone-master' into standalone-rename	Miloslav Trmač	2010-08-08	10	-23/+24
\| \| \| \| \| \| \| \| \|	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	34	-4/+38
\|
*	Merge branch 'standalone-master' into standalone-rename	Miloslav Trmač	2010-08-04	3	-99/+29
\|
*	Merge branch 'standalone-master' into standalone-rename	Miloslav Trmač	2010-08-02	1	-1/+2
\|
*	Merge branch 'standalone-master' into standalone-rename	Miloslav Trmač	2010-07-31	7	-303/+328
\|
*	Merge branch 'standalone-master' into standalone-rename	Miloslav Trmač	2010-07-31	8	-112/+144
\| \| \| \| \| \| \| \|	Conflicts: AUTHORS README TODO userspace/setkey.c
*	Merge branch 'standalone-master' into standalone-rename	Miloslav Trmač	2010-07-27	15	-182/+718
\| \| \| \| \| \|	Conflicts: COPYING examples/pk.c
*	Merge branch 'standalone-master' into standalone-rename	Miloslav Trmač	2010-07-26	31	-1138/+1172
\| \| \| \| \| \| \| \| \| \| \| \|	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	11	-876/+188
\| \| \| \| \| \| \| \|	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	224	-0/+26959
	No files are modified in this commit - this is a "bridge" for allowing merges between standalone and integrated work.