Merge 39a5101f ("Merge branch 'linus' of...

Merge 39a5101f ("Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6"

) into android-mainline

Steps on the way to 5.10-rc1

Change-Id: I4f485a6b5b9811e2cd3cfb45e58bca3d965b64ed
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>