Merge remote-tracking branch 'i3c/i3c/next'

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

Mon, 10 Dec 2018 00:38:05 +0000 (11:38 +1100)

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

Mon, 10 Dec 2018 00:38:05 +0000 (11:38 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Dec 2018 00:38:05 +0000 (11:38 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Dec 2018 00:38:05 +0000 (11:38 +1100)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/Kconfig
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 10 Dec 2018 00:38:05 +0000 (11:38 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 10 Dec 2018 00:38:05 +0000 (11:38 +1100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history