Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
Documentation/devicetree/bindings/arm/omap/omap.txt between commit
11e2191c2a6f ("ARM: dts: am437x-gp-evm: Add gp dts") from the tree and
commit c98be0c96db0 ("doc: spelling error changes") from the trivial tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc Documentation/devicetree/bindings/arm/omap/omap.txt
index 36ede19a1630,aa71962352ff..000000000000
--- a/Documentation/devicetree/bindings/arm/omap/omap.txt
+++ b/Documentation/devicetree/bindings/arm/omap/omap.txt
@@@ -117,8 -114,5 +117,8 @@@ Boards
- AM43x EPOS EVM
compatible = "ti,am43x-epos-evm", "ti,am4372", "ti,am43"
+- AM437x GP EVM
+ compatible = "ti,am437x-gp-evm", "ti,am4372", "ti,am43"
+
- - DRA7 EVM: Software Developement Board for DRA7XX
+ - DRA7 EVM: Software Development Board for DRA7XX
compatible = "ti,dra7-evm", "ti,dra7"
Attachment:
pgpMq62DZn3vY.pgp
Description: PGP signature
