diff for duplicates of <1422467792-2065-4-git-send-email-robh@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 9e07e0d..9127d28 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -7,7 +7,7 @@ used on VExpress has some issues raised by Linus W. Signed-off-by: Rob Herring <robh@kernel.org> Cc: Russell King <linux@arm.linux.org.uk> Cc: Linus Walleij <linus.walleij@linaro.org> -Cc: devicetree at vger.kernel.org +Cc: devicetree@vger.kernel.org --- arch/arm/boot/dts/versatile-ab.dts | 5 +++++ 1 file changed, 5 insertions(+) @@ -20,12 +20,12 @@ index 27d0d9c..01f4019 100644 #size-cells = <1>; ranges = <0 0x10000000 0x10000>; -+ sysreg at 0 { ++ sysreg@0 { + compatible = "arm,versatile-sysreg", "syscon"; + reg = <0x00000 0x1000>; + }; + - aaci at 4000 { + aaci@4000 { compatible = "arm,primecell"; reg = <0x4000 0x1000>; -- diff --git a/a/content_digest b/N1/content_digest index 09415bd..8060251 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,15 @@ "ref\01422467792-2065-1-git-send-email-robh@kernel.org\0" - "From\0robh@kernel.org (Rob Herring)\0" + "From\0Rob Herring <robh@kernel.org>\0" "Subject\0[PATCH 3/3] dts: versatile: add sysregs node\0" "Date\0Wed, 28 Jan 2015 11:56:32 -0600\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Daniel Lezcano <daniel.lezcano@linaro.org>" + " Thomas Gleixner <tglx@linutronix.de>\0" + "Cc\0devicetree@vger.kernel.org" + Russell King <linux@arm.linux.org.uk> + Rob Herring <robh@kernel.org> + Linus Walleij <linus.walleij@linaro.org> + linux-kernel@vger.kernel.org + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "The Versatile boards have the same sysregs as other ARM Ltd boards. Add\n" @@ -14,7 +21,7 @@ "Signed-off-by: Rob Herring <robh@kernel.org>\n" "Cc: Russell King <linux@arm.linux.org.uk>\n" "Cc: Linus Walleij <linus.walleij@linaro.org>\n" - "Cc: devicetree at vger.kernel.org\n" + "Cc: devicetree@vger.kernel.org\n" "---\n" " arch/arm/boot/dts/versatile-ab.dts | 5 +++++\n" " 1 file changed, 5 insertions(+)\n" @@ -27,15 +34,15 @@ " \t\t\t#size-cells = <1>;\n" " \t\t\tranges = <0 0x10000000 0x10000>;\n" " \n" - "+\t\t\tsysreg at 0 {\n" + "+\t\t\tsysreg@0 {\n" "+\t\t\t\tcompatible = \"arm,versatile-sysreg\", \"syscon\";\n" "+\t\t\t\treg = <0x00000 0x1000>;\n" "+\t\t\t};\n" "+\n" - " \t\t\taaci at 4000 {\n" + " \t\t\taaci@4000 {\n" " \t\t\t\tcompatible = \"arm,primecell\";\n" " \t\t\t\treg = <0x4000 0x1000>;\n" "-- \n" 2.1.0 -d52b0a57d7f86476b65b707973fa8fd40a6d3fd11a57c7ae6ed57fdbaf796b22 +36a201623148cbbe98e5c14f8f478dde3e787ebd41cbc52910b2755083d3d7c8
diff --git a/a/1.txt b/N2/1.txt index 9e07e0d..9127d28 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -7,7 +7,7 @@ used on VExpress has some issues raised by Linus W. Signed-off-by: Rob Herring <robh@kernel.org> Cc: Russell King <linux@arm.linux.org.uk> Cc: Linus Walleij <linus.walleij@linaro.org> -Cc: devicetree at vger.kernel.org +Cc: devicetree@vger.kernel.org --- arch/arm/boot/dts/versatile-ab.dts | 5 +++++ 1 file changed, 5 insertions(+) @@ -20,12 +20,12 @@ index 27d0d9c..01f4019 100644 #size-cells = <1>; ranges = <0 0x10000000 0x10000>; -+ sysreg at 0 { ++ sysreg@0 { + compatible = "arm,versatile-sysreg", "syscon"; + reg = <0x00000 0x1000>; + }; + - aaci at 4000 { + aaci@4000 { compatible = "arm,primecell"; reg = <0x4000 0x1000>; -- diff --git a/a/content_digest b/N2/content_digest index 09415bd..bd73ebb 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,15 @@ "ref\01422467792-2065-1-git-send-email-robh@kernel.org\0" - "From\0robh@kernel.org (Rob Herring)\0" + "From\0Rob Herring <robh@kernel.org>\0" "Subject\0[PATCH 3/3] dts: versatile: add sysregs node\0" "Date\0Wed, 28 Jan 2015 11:56:32 -0600\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Daniel Lezcano <daniel.lezcano@linaro.org>" + " Thomas Gleixner <tglx@linutronix.de>\0" + "Cc\0Linus Walleij <linus.walleij@linaro.org>" + Russell King <linux@arm.linux.org.uk> + linux-arm-kernel@lists.infradead.org + devicetree@vger.kernel.org + linux-kernel@vger.kernel.org + " Rob Herring <robh@kernel.org>\0" "\00:1\0" "b\0" "The Versatile boards have the same sysregs as other ARM Ltd boards. Add\n" @@ -14,7 +21,7 @@ "Signed-off-by: Rob Herring <robh@kernel.org>\n" "Cc: Russell King <linux@arm.linux.org.uk>\n" "Cc: Linus Walleij <linus.walleij@linaro.org>\n" - "Cc: devicetree at vger.kernel.org\n" + "Cc: devicetree@vger.kernel.org\n" "---\n" " arch/arm/boot/dts/versatile-ab.dts | 5 +++++\n" " 1 file changed, 5 insertions(+)\n" @@ -27,15 +34,15 @@ " \t\t\t#size-cells = <1>;\n" " \t\t\tranges = <0 0x10000000 0x10000>;\n" " \n" - "+\t\t\tsysreg at 0 {\n" + "+\t\t\tsysreg@0 {\n" "+\t\t\t\tcompatible = \"arm,versatile-sysreg\", \"syscon\";\n" "+\t\t\t\treg = <0x00000 0x1000>;\n" "+\t\t\t};\n" "+\n" - " \t\t\taaci at 4000 {\n" + " \t\t\taaci@4000 {\n" " \t\t\t\tcompatible = \"arm,primecell\";\n" " \t\t\t\treg = <0x4000 0x1000>;\n" "-- \n" 2.1.0 -d52b0a57d7f86476b65b707973fa8fd40a6d3fd11a57c7ae6ed57fdbaf796b22 +e7531e4a0ed2a023f0e92fe5313e63b8975b7528097c9d1b1c4ead001ab316de
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.