diff for duplicates of <1432921816-10765-3-git-send-email-manabian@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 4b7acb9..304b18d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -45,7 +45,7 @@ index 000000000000..fc071fa2d798 +See bindings/spi/spi-bus.txt for more information. + +Example: -+spifi: spifi@40003000 { ++spifi: spifi at 40003000 { + compatible = "nxp,lpc1773-spifi"; + reg = <0x40003000 0x1000>, <0x14000000 0x4000000>; + reg-names = "spifi", "flash"; @@ -54,7 +54,7 @@ index 000000000000..fc071fa2d798 + clock-names = "spifi", "reg"; + resets = <&rgu 53>; + -+ flash@0 { ++ flash at 0 { + compatible = "spansion,s25fl016k", "jedec,spi-nor"; + spi-cpol; + spi-cpha; @@ -62,7 +62,7 @@ index 000000000000..fc071fa2d798 + #address-cells = <1>; + #size-cells = <1>; + -+ partition@0 { ++ partition at 0 { + label = "data"; + reg = <0 0x200000>; + }; diff --git a/a/content_digest b/N1/content_digest index e8821de..3511614 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,8 @@ "ref\01432921816-10765-1-git-send-email-manabian@gmail.com\0" - "From\0Joachim Eastwood <manabian@gmail.com>\0" + "From\0manabian@gmail.com (Joachim Eastwood)\0" "Subject\0[PATCH 2/2] doc: dt: add documentation for nxp,lpc1773-spifi\0" "Date\0Fri, 29 May 2015 19:50:16 +0200\0" - "To\0computersforpeace@gmail.com" - " dwmw2@infradead.org\0" - "Cc\0shijie.huang@intel.com" - devicetree@vger.kernel.org - Joachim Eastwood <manabian@gmail.com> - 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 device tree binding documentation for the SPI Flash Interface\n" @@ -58,7 +52,7 @@ "+See bindings/spi/spi-bus.txt for more information.\n" "+\n" "+Example:\n" - "+spifi: spifi@40003000 {\n" + "+spifi: spifi at 40003000 {\n" "+\tcompatible = \"nxp,lpc1773-spifi\";\n" "+\treg = <0x40003000 0x1000>, <0x14000000 0x4000000>;\n" "+\treg-names = \"spifi\", \"flash\";\n" @@ -67,7 +61,7 @@ "+\tclock-names = \"spifi\", \"reg\";\n" "+\tresets = <&rgu 53>;\n" "+\n" - "+\tflash@0 {\n" + "+\tflash at 0 {\n" "+\t\tcompatible = \"spansion,s25fl016k\", \"jedec,spi-nor\";\n" "+\t\tspi-cpol;\n" "+\t\tspi-cpha;\n" @@ -75,7 +69,7 @@ "+\t\t#address-cells = <1>;\n" "+\t\t#size-cells = <1>;\n" "+\n" - "+\t\tpartition@0 {\n" + "+\t\tpartition at 0 {\n" "+\t\t\tlabel = \"data\";\n" "+\t\t\treg = <0 0x200000>;\n" "+\t\t};\n" @@ -85,4 +79,4 @@ "-- \n" 1.8.0 -3e7782fc43667ae04ef9ad5fb5340cc28c8b0420f33fa45e3c36b74f3f60e186 +f5f34a12cf8d00053e91d0ea6a7d89187f5432d6ba1ab5fe2d1171690e85bdf2
diff --git a/a/1.txt b/N2/1.txt index 4b7acb9..c97fbf1 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,7 +1,7 @@ Add device tree binding documentation for the SPI Flash Interface (SPIFI) found on NXP LPC18xx and LPC43xx devies. -Signed-off-by: Joachim Eastwood <manabian@gmail.com> +Signed-off-by: Joachim Eastwood <manabian-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> --- .../devicetree/bindings/mtd/nxp-spifi.txt | 56 ++++++++++++++++++++++ 1 file changed, 56 insertions(+) @@ -71,3 +71,8 @@ index 000000000000..fc071fa2d798 + -- 1.8.0 + +-- +To unsubscribe from this list: send the line "unsubscribe devicetree" in +the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N2/content_digest index e8821de..fb27ce5 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,20 +1,21 @@ "ref\01432921816-10765-1-git-send-email-manabian@gmail.com\0" - "From\0Joachim Eastwood <manabian@gmail.com>\0" + "ref\01432921816-10765-1-git-send-email-manabian-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org\0" + "From\0Joachim Eastwood <manabian-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" "Subject\0[PATCH 2/2] doc: dt: add documentation for nxp,lpc1773-spifi\0" "Date\0Fri, 29 May 2015 19:50:16 +0200\0" - "To\0computersforpeace@gmail.com" - " dwmw2@infradead.org\0" - "Cc\0shijie.huang@intel.com" - devicetree@vger.kernel.org - Joachim Eastwood <manabian@gmail.com> - linux-mtd@lists.infradead.org - " linux-arm-kernel@lists.infradead.org\0" + "To\0computersforpeace-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org" + " dwmw2-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org\0" + "Cc\0Joachim Eastwood <manabian-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>" + shijie.huang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org + linux-mtd-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + " devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" "\00:1\0" "b\0" "Add device tree binding documentation for the SPI Flash Interface\n" "(SPIFI) found on NXP LPC18xx and LPC43xx devies.\n" "\n" - "Signed-off-by: Joachim Eastwood <manabian@gmail.com>\n" + "Signed-off-by: Joachim Eastwood <manabian-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n" "---\n" " .../devicetree/bindings/mtd/nxp-spifi.txt | 56 ++++++++++++++++++++++\n" " 1 file changed, 56 insertions(+)\n" @@ -83,6 +84,11 @@ "+};\n" "+\n" "-- \n" - 1.8.0 + "1.8.0\n" + "\n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n" + "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -3e7782fc43667ae04ef9ad5fb5340cc28c8b0420f33fa45e3c36b74f3f60e186 +88e8fff235868effc02e2cca256111ca970364a8ebecbafbb1ba73663bb51d9c
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.