diff for duplicates of <1394647664-8258-8-git-send-email-b.brezillon.dev@gmail.com> diff --git a/a/1.txt b/N1/1.txt index f45572a..3a1f901 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -13,7 +13,7 @@ index 9ff0948..4c14ed8 100644 #size-cells = <1>; ranges; -+ nfc: nand@01c03000 { ++ nfc: nand at 01c03000 { + compatible = "allwinner,sun4i-nand"; + reg = <0x01c03000 0x1000>; + interrupts = <0 37 4>; @@ -24,7 +24,7 @@ index 9ff0948..4c14ed8 100644 + status = "disabled"; + }; + - emac: ethernet@01c0b000 { + emac: ethernet at 01c0b000 { compatible = "allwinner,sun4i-a10-emac"; reg = <0x01c0b000 0x1000>; -- diff --git a/a/content_digest b/N1/content_digest index 8045497..bcd0799 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,21 +1,8 @@ "ref\01394647664-8258-1-git-send-email-b.brezillon.dev@gmail.com\0" - "From\0Boris BREZILLON <b.brezillon.dev@gmail.com>\0" + "From\0b.brezillon.dev@gmail.com (Boris BREZILLON)\0" "Subject\0[PATCH v3 7/9] ARM: dt/sunxi: add NFC node to Allwinner A20 SoC\0" "Date\0Wed, 12 Mar 2014 19:07:42 +0100\0" - "To\0Maxime Ripard <maxime.ripard@free-electrons.com>" - Rob Herring <robherring2@gmail.com> - David Woodhouse <dwmw2@infradead.org> - Grant Likely <grant.likely@linaro.org> - Brian Norris <computersforpeace@gmail.com> - Jason Gunthorpe <jgunthorpe@obsidianresearch.com> - " Arnd Bergmann <arnd@arndb.de>\0" - "Cc\0devicetree@vger.kernel.org" - Boris BREZILLON <b.brezillon.dev@gmail.com> - linux-doc@vger.kernel.org - dev@linux-sunxi.org - linux-kernel@vger.kernel.org - linux-mtd@lists.infradead.org - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Add NAND Flash controller node definition to the A20 SoC.\n" @@ -33,7 +20,7 @@ " \t\t#size-cells = <1>;\n" " \t\tranges;\n" " \n" - "+\t\tnfc: nand@01c03000 {\n" + "+\t\tnfc: nand at 01c03000 {\n" "+\t\t\tcompatible = \"allwinner,sun4i-nand\";\n" "+\t\t\treg = <0x01c03000 0x1000>;\n" "+\t\t\tinterrupts = <0 37 4>;\n" @@ -44,10 +31,10 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - " \t\temac: ethernet@01c0b000 {\n" + " \t\temac: ethernet at 01c0b000 {\n" " \t\t\tcompatible = \"allwinner,sun4i-a10-emac\";\n" " \t\t\treg = <0x01c0b000 0x1000>;\n" "-- \n" 1.7.9.5 -f5a7ba8f7ba0c5b3d18074ecac4b7f81e2040bf05b4cc546cec32f1d657f3738 +e237a0305ee566c89545865863a88a5ea560644efaa411b308ea73aec349671a
diff --git a/a/1.txt b/N2/1.txt index f45572a..e0123a5 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,6 +1,6 @@ Add NAND Flash controller node definition to the A20 SoC. -Signed-off-by: Boris BREZILLON <b.brezillon.dev@gmail.com> +Signed-off-by: Boris BREZILLON <b.brezillon.dev-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> --- arch/arm/boot/dts/sun7i-a20.dtsi | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/a/content_digest b/N2/content_digest index 8045497..2b2ae46 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,26 +1,27 @@ "ref\01394647664-8258-1-git-send-email-b.brezillon.dev@gmail.com\0" - "From\0Boris BREZILLON <b.brezillon.dev@gmail.com>\0" + "ref\01394647664-8258-1-git-send-email-b.brezillon.dev-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org\0" + "From\0Boris BREZILLON <b.brezillon.dev-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" "Subject\0[PATCH v3 7/9] ARM: dt/sunxi: add NFC node to Allwinner A20 SoC\0" "Date\0Wed, 12 Mar 2014 19:07:42 +0100\0" - "To\0Maxime Ripard <maxime.ripard@free-electrons.com>" - Rob Herring <robherring2@gmail.com> - David Woodhouse <dwmw2@infradead.org> - Grant Likely <grant.likely@linaro.org> - Brian Norris <computersforpeace@gmail.com> - Jason Gunthorpe <jgunthorpe@obsidianresearch.com> - " Arnd Bergmann <arnd@arndb.de>\0" - "Cc\0devicetree@vger.kernel.org" - Boris BREZILLON <b.brezillon.dev@gmail.com> - linux-doc@vger.kernel.org - dev@linux-sunxi.org - linux-kernel@vger.kernel.org - linux-mtd@lists.infradead.org - " linux-arm-kernel@lists.infradead.org\0" + "To\0Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>" + Rob Herring <robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> + David Woodhouse <dwmw2-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org> + Grant Likely <grant.likely-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> + Brian Norris <computersforpeace-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> + Jason Gunthorpe <jgunthorpe-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org> + " Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>\0" + "Cc\0Boris BREZILLON <b.brezillon.dev-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>" + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-doc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + linux-mtd-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + " dev-3kdeTeqwOZ9EV1b7eY7vFQ@public.gmane.org\0" "\00:1\0" "b\0" "Add NAND Flash controller node definition to the A20 SoC.\n" "\n" - "Signed-off-by: Boris BREZILLON <b.brezillon.dev@gmail.com>\n" + "Signed-off-by: Boris BREZILLON <b.brezillon.dev-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n" "---\n" " arch/arm/boot/dts/sun7i-a20.dtsi | 11 +++++++++++\n" " 1 file changed, 11 insertions(+)\n" @@ -50,4 +51,4 @@ "-- \n" 1.7.9.5 -f5a7ba8f7ba0c5b3d18074ecac4b7f81e2040bf05b4cc546cec32f1d657f3738 +b439fd8ef5652e6090eb2d93c0b8997384d76e6ea8c0717679fe7525368857ac
diff --git a/a/content_digest b/N3/content_digest index 8045497..3b2e493 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -9,13 +9,13 @@ Brian Norris <computersforpeace@gmail.com> Jason Gunthorpe <jgunthorpe@obsidianresearch.com> " Arnd Bergmann <arnd@arndb.de>\0" - "Cc\0devicetree@vger.kernel.org" - Boris BREZILLON <b.brezillon.dev@gmail.com> + "Cc\0Boris BREZILLON <b.brezillon.dev@gmail.com>" + devicetree@vger.kernel.org linux-doc@vger.kernel.org - dev@linux-sunxi.org linux-kernel@vger.kernel.org + linux-arm-kernel@lists.infradead.org linux-mtd@lists.infradead.org - " linux-arm-kernel@lists.infradead.org\0" + " dev@linux-sunxi.org\0" "\00:1\0" "b\0" "Add NAND Flash controller node definition to the A20 SoC.\n" @@ -50,4 +50,4 @@ "-- \n" 1.7.9.5 -f5a7ba8f7ba0c5b3d18074ecac4b7f81e2040bf05b4cc546cec32f1d657f3738 +828c92f34612e8dd7f6e57d30e39e18517d188bd8b8f84d39280af588e6d5490
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.