| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20140506135245.1e11ac1f55aca61df58105d4@canb.auug.org.au>
Date: Tue, 6 May 2014 13:52:45 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Jiri Kosina <jkosina@...e.cz>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Carlos Garcia <carlos@...rcia.org>,
Lokesh Vutla <lokeshvutla@...com>,
Benoit Cousson <bcousson@...libre.com>
Subject: linux-next: manual merge of the trivial tree with Linus' 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
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@...b.auug.org.au
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"
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists