update to upstream
initial 842 support

Conflicts:
	drivers/crypto/nx/nx-842.c