Merge branch 'i2c-mux-dt-3' of https://github.com/peda-r/i2c-mux into i2c/for-4.9

author Wolfram Sang <wsa@the-dreams.de>

Thu, 25 Aug 2016 22:49:37 +0000 (00:49 +0200)

committer Wolfram Sang <wsa@the-dreams.de>

Thu, 25 Aug 2016 22:49:37 +0000 (00:49 +0200)
author Wolfram Sang <wsa@the-dreams.de>
Thu, 25 Aug 2016 22:49:37 +0000 (00:49 +0200)
committer Wolfram Sang <wsa@the-dreams.de>
Thu, 25 Aug 2016 22:49:37 +0000 (00:49 +0200)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/i2c/i2c-mux.c
Simple merge
author	Wolfram Sang <wsa@the-dreams.de>
	Thu, 25 Aug 2016 22:49:37 +0000 (00:49 +0200)
committer	Wolfram Sang <wsa@the-dreams.de>
	Thu, 25 Aug 2016 22:49:37 +0000 (00:49 +0200)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/i2c/i2c-mux.c	patch \|	diff1 \|	diff2 \|	blob \| history