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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'standalone-rename' into userspace-crypto	Miloslav Trmač	2010-08-27	1	-1/+0
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: .gitignore crypto/userspace/Makefile crypto/userspace/cryptodev_int.h crypto/userspace/ncr-key-wrap.c crypto/userspace/ncr-key.c crypto/userspace/ncr-pk.c crypto/userspace/ncr-sessions.c crypto/userspace/ncr.c include/linux/cryptodev.h
\| *	Merge branch 'standalone-master' into standalone-rename	Miloslav Trmač	2010-08-27	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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-rename' into userspace-crypto	Miloslav Trmač	2010-08-05	1	-0/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	Merge branch 'standalone-master' into standalone-rename	Miloslav Trmač	2010-08-05	1	-0/+1
\| \|
* \|	Merge branch 'standalone-rename' into userspace-crypto	Miloslav Trmač	2010-07-31	1	-64/+111
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: crypto/userspace/ncr-int.h crypto/userspace/ncr-limits.c
\| *	Merge branch 'standalone-master' into standalone-rename	Miloslav Trmač	2010-07-31	1	-64/+111
\| \|
* \|	Merge branch 'standalone-rename' into userspace-crypto	Miloslav Trmač	2010-07-31	1	-1/+1
\|\\|
\| *	Merge branch 'standalone-master' into standalone-rename	Miloslav Trmač	2010-07-31	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: AUTHORS README TODO userspace/setkey.c
* \|	Merge branch 'standalone-rename' into userspace-crypto	Miloslav Trmač	2010-07-27	1	-9/+12
\|\\| \| \| \| \| \| \| \| \|	Conflicts: crypto/userspace/Makefile
\| *	Merge branch 'standalone-master' into standalone-rename	Miloslav Trmač	2010-07-27	1	-9/+12
\| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: COPYING examples/pk.c
* \|	Merge branch 'standalone-rename' into userspace-crypto	Miloslav Trmač	2010-07-26	1	-3/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: crypto/userspace/Makefile crypto/userspace/ncr-data.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 crypto/userspace/ncr-sessions.c crypto/userspace/ncr.c
\| *	Merge branch 'standalone-master' into standalone-rename	Miloslav Trmač	2010-07-26	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
* \|	Update for public headers moved to include/linux	Miloslav Trmač	2010-07-22	1	-2/+2
\|/
*	Rename/delete files to fit into the kernel.	Miloslav Trmač	2010-07-22	1	-0/+199
	No files are modified in this commit - this is a "bridge" for allowing merges between standalone and integrated work.