Merge remote-tracking branch 'i2c/i2c/for-next'

author Mark Brown <broonie@linaro.org>

Thu, 17 Oct 2013 10:58:57 +0000 (11:58 +0100)

committer Mark Brown <broonie@linaro.org>

Thu, 17 Oct 2013 10:58:57 +0000 (11:58 +0100)
author Mark Brown <broonie@linaro.org>
Thu, 17 Oct 2013 10:58:57 +0000 (11:58 +0100)
committer Mark Brown <broonie@linaro.org>
Thu, 17 Oct 2013 10:58:57 +0000 (11:58 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/mach-davinci/board-dm365-evm.c
Simple merge
diff --cc drivers/i2c/busses/i2c-mxs.c
Simple merge
diff --cc drivers/i2c/i2c-core.c
Simple merge
diff --cc drivers/i2c/muxes/i2c-arb-gpio-challenge.c
Simple merge
diff --cc drivers/i2c/muxes/i2c-mux-gpio.c
Simple merge
author	Mark Brown <broonie@linaro.org>
	Thu, 17 Oct 2013 10:58:57 +0000 (11:58 +0100)
committer	Mark Brown <broonie@linaro.org>
	Thu, 17 Oct 2013 10:58:57 +0000 (11:58 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/board-dm365-evm.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/i2c-mxs.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/i2c/i2c-core.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/i2c/muxes/i2c-arb-gpio-challenge.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/i2c/muxes/i2c-mux-gpio.c	patch \|	diff1 \|	diff2 \|	blob \| history