Merge 50635787 ("Merge tag 'spi-fix-v6.0-rc4' of...

Merge 50635787 ("Merge tag 'spi-fix-v6.0-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi"

) into android-mainline

Steps on the way to 6.0-rc5

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