Merge remote-tracking branch 'crypto/master'

diff --cc crypto/Kconfig
Simple merge

diff --cc crypto/Makefile
Simple merge

diff --cc drivers/char/hw_random/Kconfig
Simple merge

diff --cc drivers/char/hw_random/Makefile
Simple merge

diff --cc drivers/crypto/ixp4xx_crypto.c
Simple merge