diff for duplicates of <201405241323.04179.marex@denx.de> diff --git a/a/1.txt b/N1/1.txt index c5e68e0..088e516 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -19,7 +19,7 @@ a confused fashion. > status = "disabled"; > }; > -> + crypto: crypto-engine@01c15000 { +> + crypto: crypto-engine at 01c15000 { > + compatible = "allwinner,sun7i-a20-crypto"; > + reg = <0x01c15000 0x1000>; > + interrupts = <0 86 4>; @@ -27,7 +27,7 @@ a confused fashion. > + clock-names = "ahb", "mod"; > + }; > + -> spi2: spi@01c17000 { +> spi2: spi at 01c17000 { > compatible = "allwinner,sun4i-a10-spi"; > reg = <0x01c17000 0x1000>; diff --git a/a/content_digest b/N1/content_digest index 81b68a0..606d5a1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,24 +1,9 @@ "ref\01400771396-9686-1-git-send-email-clabbe.montjoie@gmail.com\0" "ref\01400771396-9686-3-git-send-email-clabbe.montjoie@gmail.com\0" - "From\0Marek Vasut <marex@denx.de>\0" - "Subject\0Re: [PATCH 2/3] ARM: sun7i: dt: Add Security System to A20 SoC DTS\0" + "From\0marex@denx.de (Marek Vasut)\0" + "Subject\0[PATCH 2/3] ARM: sun7i: dt: Add Security System to A20 SoC DTS\0" "Date\0Sat, 24 May 2014 13:23:04 +0200\0" - "To\0LABBE Corentin <clabbe.montjoie@gmail.com>\0" - "Cc\0robh+dt@kernel.org" - pawel.moll@arm.com - mark.rutland@arm.com - ijc+devicetree@hellion.org.uk - galak@codeaurora.org - rdunlap@infradead.org - maxime.ripard@free-electrons.com - linux@arm.linux.org.uk - herbert@gondor.apana.org.au - davem@davemloft.net - grant.likely@linaro.org - devicetree@vger.kernel.org - linux-arm-kernel@lists.infradead.org - linux-kernel@vger.kernel.org - " linux-crypto@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Thursday, May 22, 2014 at 05:09:55 PM, LABBE Corentin wrote:\n" @@ -42,7 +27,7 @@ "> \t\t\tstatus = \"disabled\";\n" "> \t\t};\n" "> \n" - "> +\t\tcrypto: crypto-engine@01c15000 {\n" + "> +\t\tcrypto: crypto-engine at 01c15000 {\n" "> +\t\t\tcompatible = \"allwinner,sun7i-a20-crypto\";\n" "> +\t\t\treg = <0x01c15000 0x1000>;\n" "> +\t\t\tinterrupts = <0 86 4>;\n" @@ -50,11 +35,11 @@ "> +\t\t\tclock-names = \"ahb\", \"mod\";\n" "> +\t\t};\n" "> +\n" - "> \t\tspi2: spi@01c17000 {\n" + "> \t\tspi2: spi at 01c17000 {\n" "> \t\t\tcompatible = \"allwinner,sun4i-a10-spi\";\n" "> \t\t\treg = <0x01c17000 0x1000>;\n" "\n" "Best regards,\n" Marek Vasut -0d53763ec2cf01a9d70d74f5c43c60199c0e0284a0ea78e2a7422377291b68e9 +aa7349ad3b491611543ff1e2f94f26d7ebfe366019242a9450eb2890d5dc9425
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.