Merge remote-tracking branch 'i2c/i2c/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 00:34:37 +0000 (11:34 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 00:34:37 +0000 (11:34 +1100)
1  2 
MAINTAINERS
drivers/i2c/busses/i2c-ismt.c
include/linux/acpi.h

diff --cc 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
Simple merge
Simple merge