Merge e1ae4b0b ("Merge branch 'mtd/fixes' of...

Merge e1ae4b0b ("Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux"

) into android-mainline

Steps on the way to 5.11-rc5

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