crypto: upstream 3.4 compatible

Conflicts:
	crypto/Kconfig
	crypto/testmgr.h
	drivers/crypto/Kconfig
	drivers/crypto/Makefile
	drivers/crypto/caam/caamalg.c
	drivers/crypto/caam/ctrl.c
	drivers/crypto/caam/desc_constr.h
	drivers/crypto/tegra-se.c
	drivers/crypto/tegra-se.h
	include/linux/crypto.h