linux-next: manual merge of the trivial tree with the arm-soc tree

Hi Jiri, Today's linux-next merge of the trivial tree got a conflict in Documentation/devicetree/bindings/arm/omap/omap.txt between commit 38b248db60e3 ("ARM: dts: Add support for DRA72x family of devices") from the arm-soc tree and commit c98be0c96db0 ("doc: spelling error changes") from the

linux-next: manual merge of the trivial tree with the arm-soc tree

Hi Jiri, Today's linux-next merge of the trivial tree got a conflict in Documentation/devicetree/bindings/arm/omap/omap.txt between commit 38b248db60e3 (ARM: dts: Add support for DRA72x family of devices) from the arm-soc tree and commit c98be0c96db0 (doc: spelling error changes) from the trivial