summaryrefslogtreecommitdiffstats
path: root/Documentation/devicetree/bindings/spi
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2020-08-25 11:02:09 +0100
committerMark Brown <broonie@kernel.org>2020-08-25 11:02:09 +0100
commitfb535aa017059499c913c3b90e453c119ecfb30e (patch)
treeda3a75a11d553408231698a40ccc2672be15558c /Documentation/devicetree/bindings/spi
parent20c05a05506361a6c355e9944d5616f5ed1e01c8 (diff)
parentd012a7190fc1fd72ed48911e77ca97ba4521bccd (diff)
downloadlinux-fb535aa017059499c913c3b90e453c119ecfb30e.tar.bz2
Merge tag 'v5.9-rc2' into spi-5.10
Linux 5.9-rc2
Diffstat (limited to 'Documentation/devicetree/bindings/spi')
-rw-r--r--Documentation/devicetree/bindings/spi/fsl-imx-cspi.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/spi/fsl-imx-cspi.yaml b/Documentation/devicetree/bindings/spi/fsl-imx-cspi.yaml
index 1b50cedbfb3e..50df1a40bbe3 100644
--- a/Documentation/devicetree/bindings/spi/fsl-imx-cspi.yaml
+++ b/Documentation/devicetree/bindings/spi/fsl-imx-cspi.yaml
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Freescale (Enhanced) Configurable Serial Peripheral Interface (CSPI/eCSPI) for i.MX
maintainers:
- - Shawn Guo <shawn.guo@linaro.org>
+ - Shawn Guo <shawnguo@kernel.org>
allOf:
- $ref: "/schemas/spi/spi-controller.yaml#"