Merge branch 'i2c/software-nodes' into i2c/for-5.13

author Wolfram Sang <[email protected]>

Sat, 10 Apr 2021 19:48:34 +0000 (21:48 +0200)

committer Wolfram Sang <[email protected]>

Sat, 10 Apr 2021 19:48:34 +0000 (21:48 +0200)
author Wolfram Sang <[email protected]>
Sat, 10 Apr 2021 19:48:34 +0000 (21:48 +0200)
committer Wolfram Sang <[email protected]>
Sat, 10 Apr 2021 19:48:34 +0000 (21:48 +0200)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/i2c/i2c-core-base.c
Simple merge
diff --cc include/linux/i2c.h
Simple merge
author	Wolfram Sang <[email protected]>
	Sat, 10 Apr 2021 19:48:34 +0000 (21:48 +0200)
committer	Wolfram Sang <[email protected]>
	Sat, 10 Apr 2021 19:48:34 +0000 (21:48 +0200)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/i2c/i2c-core-base.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/i2c.h	patch \|	diff1 \|	diff2 \|	blob \| history