diff for duplicates of <53720A88.3050907@st.com> diff --git a/a/1.txt b/N1/1.txt index 10fbf0f..617db49 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -74,7 +74,7 @@ On 03/12/2014 09:50 AM, Maxime COQUELIN wrote: > + }; > + > + soc { -> + sbc_serial0: serial at 9530000 { +> + sbc_serial0: serial@9530000 { > + status = "okay"; > + }; > + @@ -93,28 +93,28 @@ On 03/12/2014 09:50 AM, Maxime COQUELIN wrote: > + }; > + }; > + -> + i2c at 9842000 { +> + i2c@9842000 { > + status = "okay"; > + }; > + -> + i2c at 9843000 { +> + i2c@9843000 { > + status = "okay"; > + }; > + -> + i2c at 9844000 { +> + i2c@9844000 { > + status = "okay"; > + }; > + -> + i2c at 9845000 { +> + i2c@9845000 { > + status = "okay"; > + }; > + -> + i2c at 9540000 { +> + i2c@9540000 { > + status = "okay"; > + }; > + > + /* SSC11 to HDMI */ -> + i2c at 9541000 { +> + i2c@9541000 { > + status = "okay"; > + /* HDMI V1.3a supports Standard mode only */ > + clock-frequency = <100000>; diff --git a/a/content_digest b/N1/content_digest index fd7883d..613f54b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,26 @@ "ref\01394614210-15698-1-git-send-email-maxime.coquelin@st.com\0" "ref\01394614210-15698-7-git-send-email-maxime.coquelin@st.com\0" - "From\0patrice.chotard@st.com (Patrice Chotard)\0" - "Subject\0[STLinux Kernel] [PATCH v4 6/6] ARM: dts: STiH407: Add B2120 board support\0" + "From\0Patrice Chotard <patrice.chotard@st.com>\0" + "Subject\0Re: [STLinux Kernel] [PATCH v4 6/6] ARM: dts: STiH407: Add B2120 board support\0" "Date\0Tue, 13 May 2014 14:05:28 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Maxime COQUELIN <maxime.coquelin@st.com>" + Rob Landley <rob@landley.net> + Rob Herring <robh+dt@kernel.org> + Pawel Moll <pawel.moll@arm.com> + Mark Rutland <mark.rutland@arm.com> + Ian Campbell <ijc+devicetree@hellion.org.uk> + Kumar Gala <galak@codeaurora.org> + Russell King <linux@arm.linux.org.uk> + Srinivas Kandagatla <srinivas.kandagatla@st.com> + Stuart Menefy <stuart.menefy@st.com> + Linus Walleij <linus.walleij@linaro.org> + Giuseppe Cavallaro <peppe.cavallaro@st.com> + linux-doc@vger.kernel.org + linux-kernel@vger.kernel.org + devicetree@vger.kernel.org + linux-arm-kernel@lists.infradead.org + " kernel@stlinux.com\0" + "Cc\0lee.jones@linaro.org\0" "\00:1\0" "b\0" "\n" @@ -82,7 +99,7 @@ "> +\t};\n" "> +\n" "> +\tsoc {\n" - "> +\t\tsbc_serial0: serial at 9530000 {\n" + "> +\t\tsbc_serial0: serial@9530000 {\n" "> +\t\t\tstatus = \"okay\";\n" "> +\t\t};\n" "> +\n" @@ -101,28 +118,28 @@ "> +\t\t\t};\n" "> +\t\t};\n" "> +\n" - "> +\t\ti2c at 9842000 {\n" + "> +\t\ti2c@9842000 {\n" "> +\t\t\tstatus = \"okay\";\n" "> +\t\t};\n" "> +\n" - "> +\t\ti2c at 9843000 {\n" + "> +\t\ti2c@9843000 {\n" "> +\t\t\tstatus = \"okay\";\n" "> +\t\t};\n" "> +\n" - "> +\t\ti2c at 9844000 {\n" + "> +\t\ti2c@9844000 {\n" "> +\t\t\tstatus = \"okay\";\n" "> +\t\t};\n" "> +\n" - "> +\t\ti2c at 9845000 {\n" + "> +\t\ti2c@9845000 {\n" "> +\t\t\tstatus = \"okay\";\n" "> +\t\t};\n" "> +\n" - "> +\t\ti2c at 9540000 {\n" + "> +\t\ti2c@9540000 {\n" "> +\t\t\tstatus = \"okay\";\n" "> +\t\t};\n" "> +\n" "> +\t\t/* SSC11 to HDMI */\n" - "> +\t\ti2c at 9541000 {\n" + "> +\t\ti2c@9541000 {\n" "> +\t\t\tstatus = \"okay\";\n" "> +\t\t\t/* HDMI V1.3a supports Standard mode only */\n" "> +\t\t\tclock-frequency = <100000>;\n" @@ -134,4 +151,4 @@ "\n" Acked-by: Patrice Chotard <patrice.chotard@st.com> -c4c5bcf12acda8b2170dc93cf19efaf326be43f1ee78969882e87542428238b9 +6143bb77092f6eecaeae49af0cc0790d81adc484bcc482ed5925e45e1e3b1b45
diff --git a/a/1.txt b/N2/1.txt index 10fbf0f..617db49 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -74,7 +74,7 @@ On 03/12/2014 09:50 AM, Maxime COQUELIN wrote: > + }; > + > + soc { -> + sbc_serial0: serial at 9530000 { +> + sbc_serial0: serial@9530000 { > + status = "okay"; > + }; > + @@ -93,28 +93,28 @@ On 03/12/2014 09:50 AM, Maxime COQUELIN wrote: > + }; > + }; > + -> + i2c at 9842000 { +> + i2c@9842000 { > + status = "okay"; > + }; > + -> + i2c at 9843000 { +> + i2c@9843000 { > + status = "okay"; > + }; > + -> + i2c at 9844000 { +> + i2c@9844000 { > + status = "okay"; > + }; > + -> + i2c at 9845000 { +> + i2c@9845000 { > + status = "okay"; > + }; > + -> + i2c at 9540000 { +> + i2c@9540000 { > + status = "okay"; > + }; > + > + /* SSC11 to HDMI */ -> + i2c at 9541000 { +> + i2c@9541000 { > + status = "okay"; > + /* HDMI V1.3a supports Standard mode only */ > + clock-frequency = <100000>; diff --git a/a/content_digest b/N2/content_digest index fd7883d..a4f7498 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,9 +1,26 @@ "ref\01394614210-15698-1-git-send-email-maxime.coquelin@st.com\0" "ref\01394614210-15698-7-git-send-email-maxime.coquelin@st.com\0" - "From\0patrice.chotard@st.com (Patrice Chotard)\0" - "Subject\0[STLinux Kernel] [PATCH v4 6/6] ARM: dts: STiH407: Add B2120 board support\0" + "From\0Patrice Chotard <patrice.chotard@st.com>\0" + "Subject\0Re: [STLinux Kernel] [PATCH v4 6/6] ARM: dts: STiH407: Add B2120 board support\0" "Date\0Tue, 13 May 2014 14:05:28 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Maxime COQUELIN <maxime.coquelin@st.com>" + Rob Landley <rob@landley.net> + Rob Herring <robh+dt@kernel.org> + Pawel Moll <pawel.moll@arm.com> + Mark Rutland <mark.rutland@arm.com> + Ian Campbell <ijc+devicetree@hellion.org.uk> + Kumar Gala <galak@codeaurora.org> + Russell King <linux@arm.linux.org.uk> + Srinivas Kandagatla <srinivas.kandagatla@st.com> + Stuart Menefy <stuart.menefy@st.com> + Linus Walleij <linus.walleij@linaro.org> + Giuseppe Cavallaro <peppe.cavallaro@st.com> + <linux-doc@vger.kernel.org> + <linux-kernel@vger.kernel.org> + <devicetree@vger.kernel.org> + <linux-arm-kernel@lists.infradead.org> + " <kernel@stlinux.com>\0" + "Cc\0<lee.jones@linaro.org>\0" "\00:1\0" "b\0" "\n" @@ -82,7 +99,7 @@ "> +\t};\n" "> +\n" "> +\tsoc {\n" - "> +\t\tsbc_serial0: serial at 9530000 {\n" + "> +\t\tsbc_serial0: serial@9530000 {\n" "> +\t\t\tstatus = \"okay\";\n" "> +\t\t};\n" "> +\n" @@ -101,28 +118,28 @@ "> +\t\t\t};\n" "> +\t\t};\n" "> +\n" - "> +\t\ti2c at 9842000 {\n" + "> +\t\ti2c@9842000 {\n" "> +\t\t\tstatus = \"okay\";\n" "> +\t\t};\n" "> +\n" - "> +\t\ti2c at 9843000 {\n" + "> +\t\ti2c@9843000 {\n" "> +\t\t\tstatus = \"okay\";\n" "> +\t\t};\n" "> +\n" - "> +\t\ti2c at 9844000 {\n" + "> +\t\ti2c@9844000 {\n" "> +\t\t\tstatus = \"okay\";\n" "> +\t\t};\n" "> +\n" - "> +\t\ti2c at 9845000 {\n" + "> +\t\ti2c@9845000 {\n" "> +\t\t\tstatus = \"okay\";\n" "> +\t\t};\n" "> +\n" - "> +\t\ti2c at 9540000 {\n" + "> +\t\ti2c@9540000 {\n" "> +\t\t\tstatus = \"okay\";\n" "> +\t\t};\n" "> +\n" "> +\t\t/* SSC11 to HDMI */\n" - "> +\t\ti2c at 9541000 {\n" + "> +\t\ti2c@9541000 {\n" "> +\t\t\tstatus = \"okay\";\n" "> +\t\t\t/* HDMI V1.3a supports Standard mode only */\n" "> +\t\t\tclock-frequency = <100000>;\n" @@ -134,4 +151,4 @@ "\n" Acked-by: Patrice Chotard <patrice.chotard@st.com> -c4c5bcf12acda8b2170dc93cf19efaf326be43f1ee78969882e87542428238b9 +47a28763f191b2abb3a189d1ff5c5c117dce4cd3d6f1f72486bcca28a1bb166d
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.