Merge remote-tracking branch 'input-current/for-linus'

author Stephen Rothwell <sfr@canb.auug.org.au>

Wed, 5 May 2021 22:48:40 +0000 (08:48 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Wed, 5 May 2021 22:48:40 +0000 (08:48 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 May 2021 22:48:40 +0000 (08:48 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 May 2021 22:48:40 +0000 (08:48 +1000)
diff --cc Documentation/devicetree/bindings/vendor-prefixes.yaml
Simple merge
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/input/misc/Kconfig
Simple merge
diff --cc drivers/input/misc/Makefile
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 5 May 2021 22:48:40 +0000 (08:48 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 5 May 2021 22:48:40 +0000 (08:48 +1000)
		1	2
Documentation/devicetree/bindings/vendor-prefixes.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/input/misc/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/input/misc/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history