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

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