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

author Thierry Reding <treding@nvidia.com>

Fri, 25 Oct 2013 09:30:15 +0000 (11:30 +0200)

committer Thierry Reding <treding@nvidia.com>

Fri, 25 Oct 2013 09:30:15 +0000 (11:30 +0200)
author Thierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:30:15 +0000 (11:30 +0200)
committer Thierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:30:15 +0000 (11:30 +0200)
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	Thierry Reding <treding@nvidia.com>
	Fri, 25 Oct 2013 09:30:15 +0000 (11:30 +0200)
committer	Thierry Reding <treding@nvidia.com>
	Fri, 25 Oct 2013 09:30:15 +0000 (11:30 +0200)
		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