diff for duplicates of <6818713.ulHphNVRsJ@wasted.cogentembedded.com> diff --git a/a/1.txt b/N1/1.txt index cd10728..a5aac72 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -9,7 +9,8 @@ Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> 1 file changed, 2 insertions(+), 2 deletions(-) Index: renesas/Documentation/devicetree/bindings/arm/shmobile.txt -=================================--- renesas.orig/Documentation/devicetree/bindings/arm/shmobile.txt +=================================================================== +--- renesas.orig/Documentation/devicetree/bindings/arm/shmobile.txt +++ renesas/Documentation/devicetree/bindings/arm/shmobile.txt @@ -57,5 +57,5 @@ Boards: compatible = "renesas,marzen", "renesas,r8a7779" diff --git a/a/content_digest b/N1/content_digest index c995edb..c379d58 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0201404250239.39150.sergei.shtylyov@cogentembedded.com\0" - "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" + "From\0sergei.shtylyov@cogentembedded.com (Sergei Shtylyov)\0" "Subject\0[PATCH] ARM: shmobile: fix SILK board name\0" - "Date\0Fri, 02 Oct 2015 21:53:38 +0000\0" + "Date\0Sat, 03 Oct 2015 00:53:38 +0300\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -16,7 +16,8 @@ " 1 file changed, 2 insertions(+), 2 deletions(-)\n" "\n" "Index: renesas/Documentation/devicetree/bindings/arm/shmobile.txt\n" - "=================================--- renesas.orig/Documentation/devicetree/bindings/arm/shmobile.txt\n" + "===================================================================\n" + "--- renesas.orig/Documentation/devicetree/bindings/arm/shmobile.txt\n" "+++ renesas/Documentation/devicetree/bindings/arm/shmobile.txt\n" "@@ -57,5 +57,5 @@ Boards:\n" " compatible = \"renesas,marzen\", \"renesas,r8a7779\"\n" @@ -27,4 +28,4 @@ "+ - SILK (RTP0RC7794LCB00011S)\n" "+ compatible = \"renesas,silk\", \"renesas,r8a7794\"" -244c5fbd994c562dafaf6fc20321a0437696d6e61219c186c9bab32ef619a403 +69a3e24692c4634f61f4b2f013e5f604a69195a5640cc716086b7eb364d6b6ff
diff --git a/a/1.txt b/N2/1.txt index cd10728..a5aac72 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -9,7 +9,8 @@ Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> 1 file changed, 2 insertions(+), 2 deletions(-) Index: renesas/Documentation/devicetree/bindings/arm/shmobile.txt -=================================--- renesas.orig/Documentation/devicetree/bindings/arm/shmobile.txt +=================================================================== +--- renesas.orig/Documentation/devicetree/bindings/arm/shmobile.txt +++ renesas/Documentation/devicetree/bindings/arm/shmobile.txt @@ -57,5 +57,5 @@ Boards: compatible = "renesas,marzen", "renesas,r8a7779" diff --git a/a/content_digest b/N2/content_digest index c995edb..2aa47e3 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,15 @@ "ref\0201404250239.39150.sergei.shtylyov@cogentembedded.com\0" "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" "Subject\0[PATCH] ARM: shmobile: fix SILK board name\0" - "Date\0Fri, 02 Oct 2015 21:53:38 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Sat, 03 Oct 2015 00:53:38 +0300\0" + "To\0robh+dt@kernel.org" + pawel.moll@arm.com + mark.rutland@arm.com + ijc+devicetree@hellion.org.uk + galak@codeaurora.org + " devicetree@vger.kernel.org\0" + "Cc\0linux-sh@vger.kernel.org" + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Unfortunately, the SILK board bindings were not quite correct, as the board\n" @@ -16,7 +23,8 @@ " 1 file changed, 2 insertions(+), 2 deletions(-)\n" "\n" "Index: renesas/Documentation/devicetree/bindings/arm/shmobile.txt\n" - "=================================--- renesas.orig/Documentation/devicetree/bindings/arm/shmobile.txt\n" + "===================================================================\n" + "--- renesas.orig/Documentation/devicetree/bindings/arm/shmobile.txt\n" "+++ renesas/Documentation/devicetree/bindings/arm/shmobile.txt\n" "@@ -57,5 +57,5 @@ Boards:\n" " compatible = \"renesas,marzen\", \"renesas,r8a7779\"\n" @@ -27,4 +35,4 @@ "+ - SILK (RTP0RC7794LCB00011S)\n" "+ compatible = \"renesas,silk\", \"renesas,r8a7794\"" -244c5fbd994c562dafaf6fc20321a0437696d6e61219c186c9bab32ef619a403 +f2b75a2442694f4158407e67c8e41ddc3c79b5dd8a19970e567622a637ca3691
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.