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

diff --cc MAINTAINERS
index 73c952bb13e9da0ea6bd41c9da9eefc23d6744b6,fc8df4ff6ad6417325bb45921a0eff040bda82fa..1e1c3f87acd2dcf46e863202cf557d6d8b71d0f2
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1625,9 -1606,8 +1625,10 @@@ M:     Masahiro Yamada <yamada.masahiro@soc
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/boot/dts/uniphier*
 +F:    arch/arm/include/asm/hardware/cache-uniphier.h
  F:    arch/arm/mach-uniphier/
 +F:    arch/arm/mm/cache-uniphier.c
+ F:    drivers/i2c/busses/i2c-uniphier*
  F:    drivers/pinctrl/uniphier/
  F:    drivers/tty/serial/8250/8250_uniphier.c
  N:    uniphier

diff --cc drivers/i2c/busses/i2c-ismt.c
Simple merge

diff --cc include/linux/acpi.h
Simple merge