From: Wolfram Sang <wsa@kernel.org>
Date: Mon, 7 Dec 2020 06:57:42 +0000 (+0100)
Subject: Merge branch 'i2c/for-current' into i2c/for-5.11
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1e04538c751bfc572bfa9995996c7f4af098a625;p=linux.git

Merge branch 'i2c/for-current' into i2c/for-5.11
---

1e04538c751bfc572bfa9995996c7f4af098a625
diff --cc MAINTAINERS
index b2b505ff31f53,6f474153dbec5..1d097b9da3540
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -11163,10 -11157,9 +11157,10 @@@ F:	Documentation/devicetree/bindings/in
  F:	drivers/input/touchscreen/melfas_mip4.c
  
  MELLANOX BLUEFIELD I2C DRIVER
- M:	Khalil Blaiech <kblaiech@mellanox.com>
+ M:	Khalil Blaiech <kblaiech@nvidia.com>
  L:	linux-i2c@vger.kernel.org
  S:	Supported
 +F:	Documentation/devicetree/bindings/i2c/mellanox,i2c-mlxbf.yaml
  F:	drivers/i2c/busses/i2c-mlxbf.c
  
  MELLANOX ETHERNET DRIVER (mlx4_en)