aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/devicetree/bindings/gpio
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2020-10-06 08:38:32 -0500
committerRob Herring <robh@kernel.org>2020-10-06 08:38:32 -0500
commitaa6174f0d31e4d5785a843fc79a433bed7cac784 (patch)
treeaf3634259876c4986ef4fde2972e40c8d0f1068a /Documentation/devicetree/bindings/gpio
parentdt-bindings: mfd: ti,j721e-system-controller: Fix incorrect pattern property (diff)
parentscripts/dtc: only append to HOST_EXTRACFLAGS instead of overwriting (diff)
downloadlinux-dev-aa6174f0d31e4d5785a843fc79a433bed7cac784.tar.xz
linux-dev-aa6174f0d31e4d5785a843fc79a433bed7cac784.zip
Merge branch 'dt/linus' into dt/next
Diffstat (limited to 'Documentation/devicetree/bindings/gpio')
-rw-r--r--Documentation/devicetree/bindings/gpio/gpio-mxs.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/gpio/gpio-mxs.yaml b/Documentation/devicetree/bindings/gpio/gpio-mxs.yaml
index ccf5b50e798b..dfa1133f8c5e 100644
--- a/Documentation/devicetree/bindings/gpio/gpio-mxs.yaml
+++ b/Documentation/devicetree/bindings/gpio/gpio-mxs.yaml
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Freescale MXS GPIO controller
maintainers:
- - Shawn Guo <shawn.guo@linaro.org>
+ - Shawn Guo <shawnguo@kernel.org>
- Anson Huang <Anson.Huang@nxp.com>
description: |