Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

Merge upstream tree in order to reinstate crct10dif.

diff --cc arch/arm/mach-omap2/devices.c
Simple merge

diff --cc crypto/testmgr.c
Simple merge

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

diff --cc drivers/crypto/caam/caamhash.c
Simple merge