Merge 13391c60 ("Merge branch 'linus' of...

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

) into android-mainline

Steps to 5.11-rc6, fixing problems in -rc5

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