Merge e0fbd25b ("Merge branch 'for-linus' of...

Merge e0fbd25b ("Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input"

) into android-mainline

Steps on the way to 5.12-rc1

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