aboutsummaryrefslogtreecommitdiff
path: root/Documentation/devicetree/bindings/i2c
diff options
context:
space:
mode:
authorGravatar Wolfram Sang <wsa@kernel.org> 2022-09-27 21:33:37 +0200
committerGravatar Wolfram Sang <wsa@kernel.org> 2022-09-27 21:33:37 +0200
commit85f17d677f6c40069287617630f202eb20fcfe36 (patch)
treea0a7de12ddf19068b14124d7a64d79cf697e0710 /Documentation/devicetree/bindings/i2c
parentmacintosh/ams: Adapt declaration of ams_i2c_remove() to earlier change (diff)
parentLinux 6.0-rc7 (diff)
downloadlinux-85f17d677f6c40069287617630f202eb20fcfe36.tar.gz
linux-85f17d677f6c40069287617630f202eb20fcfe36.tar.bz2
linux-85f17d677f6c40069287617630f202eb20fcfe36.zip
Merge branch 'master' into i2c/for-mergewindow
Diffstat (limited to 'Documentation/devicetree/bindings/i2c')
-rw-r--r--Documentation/devicetree/bindings/i2c/amlogic,meson6-i2c.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/i2c/amlogic,meson6-i2c.yaml b/Documentation/devicetree/bindings/i2c/amlogic,meson6-i2c.yaml
index 6ecb0270d88d..199a354ccb97 100644
--- a/Documentation/devicetree/bindings/i2c/amlogic,meson6-i2c.yaml
+++ b/Documentation/devicetree/bindings/i2c/amlogic,meson6-i2c.yaml
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#"
title: Amlogic Meson I2C Controller
maintainers:
- - Neil Armstrong <narmstrong@baylibre.com>
+ - Neil Armstrong <neil.armstrong@linaro.org>
- Beniamino Galvani <b.galvani@gmail.com>
allOf: