From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 5 Nov 2015 00:34:37 +0000 (+1100)
Subject: Merge remote-tracking branch 'i2c/i2c/for-next'
X-Git-Tag: KARO-TXUL-2015-12-04~109
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=c193419a9a458687e8a61004f18b57e3a061ccd3

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

c193419a9a458687e8a61004f18b57e3a061ccd3
diff --cc MAINTAINERS
index 73c952bb13e9,fc8df4ff6ad6..1e1c3f87acd2
--- a/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