diff options
author | Rob Herring <robh@kernel.org> | 2020-10-06 16:38:32 +0300 |
---|---|---|
committer | Rob Herring <robh@kernel.org> | 2020-10-06 16:38:32 +0300 |
commit | aa6174f0d31e4d5785a843fc79a433bed7cac784 (patch) | |
tree | af3634259876c4986ef4fde2972e40c8d0f1068a /Documentation/devicetree/bindings/pwm | |
parent | 1b25b207d207f2bdbc7aeff81426e6a0428a6012 (diff) | |
parent | efe84d408bf41975db8506d3a1cc02e794e2309c (diff) | |
download | linux-aa6174f0d31e4d5785a843fc79a433bed7cac784.tar.xz |
Merge branch 'dt/linus' into dt/next
Diffstat (limited to 'Documentation/devicetree/bindings/pwm')
-rw-r--r-- | Documentation/devicetree/bindings/pwm/mxs-pwm.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/pwm/mxs-pwm.yaml b/Documentation/devicetree/bindings/pwm/mxs-pwm.yaml index da68f4a25dd9..8740e076061e 100644 --- a/Documentation/devicetree/bindings/pwm/mxs-pwm.yaml +++ b/Documentation/devicetree/bindings/pwm/mxs-pwm.yaml @@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# title: Freescale MXS PWM controller maintainers: - - Shawn Guo <shawn.guo@linaro.org> + - Shawn Guo <shawnguo@kernel.org> - Anson Huang <anson.huang@nxp.com> properties: |