diff for duplicates of <201305081818.01927.arnd@arndb.de> diff --git a/a/1.txt b/N1/1.txt index 4f6d41b..dd0ab97 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -81,7 +81,7 @@ Please keep this in alphabetical order. The "#interrupt-cells" property doesn't belong here I think. > + -> + uart2: uart@fed32000 { +> + uart2: uart at fed32000 { > + compatible = "st,asc"; > + status = "disabled"; > + reg = <0xfed32000 0x2c>; @@ -92,7 +92,7 @@ The "#interrupt-cells" property doesn't belong here I think. > + }; > + > + /* SBC comms block ASCs in SASG1 */ -> + sbc_uart1: uart@fe531000 { +> + sbc_uart1: uart at fe531000 { > + compatible = "st,asc"; > + status = "disabled"; > + reg = <0xfe531000 0x2c>; diff --git a/a/content_digest b/N1/content_digest index 482c46f..57ca553 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,33 +1,9 @@ "ref\01368022187-1633-1-git-send-email-srinivas.kandagatla@st.com\0" "ref\01368022297-2334-1-git-send-email-srinivas.kandagatla@st.com\0" - "From\0Arnd Bergmann <arnd@arndb.de>\0" - "Subject\0Re: [RFC 5/8] ARM:stih41x: Add STiH415 SOC support\0" + "From\0arnd@arndb.de (Arnd Bergmann)\0" + "Subject\0[RFC 5/8] ARM:stih41x: Add STiH415 SOC support\0" "Date\0Wed, 8 May 2013 18:18:01 +0200\0" - "To\0Srinivas KANDAGATLA <srinivas.kandagatla@st.com>\0" - "Cc\0linux@arm.linux.org.uk" - olof@lixom.net - Rob Landley <rob@landley.net> - Grant Likely <grant.likely@secretlab.ca> - Rob Herring <rob.herring@calxeda.com> - Samuel Ortiz <sameo@linux.intel.com> - Linus Walleij <linus.walleij@linaro.org> - Greg Kroah-Hartman <gregkh@linuxfoundation.org> - Jiri Slaby <jslaby@suse.cz> - Stuart Menefy <stuart.menefy@st.com> - Shawn Guo <shawn.guo@linaro.org> - Jason Cooper <jason@lakedaemon.net> - Stephen Warren <swarren@nvidia.com> - Maxime Ripard <maxime.ripard@free-electrons.com> - Nicolas Pitre <nico@linaro.org> - Will Deacon <will.deacon@arm.com> - Dave Martin <dave.martin@linaro.org> - Marc Zyngier <marc.zyngier@arm.com> - Viresh Kumar <viresh.kumar@linaro.org> - Mark Brown <broonie@opensource.wolfsonmicro.com> - Dong Aisheng <dong.aisheng@linaro.org> - linux-doc@vger.kernel.org - linux-kernel@vger.kernel.org - " devicetree-discuss@lists.ozlabs.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Wednesday 08 May 2013, Srinivas KANDAGATLA wrote:\n" @@ -113,7 +89,7 @@ "The \"#interrupt-cells\" property doesn't belong here I think.\n" "\n" "> +\n" - "> +\t\tuart2: uart@fed32000 {\n" + "> +\t\tuart2: uart at fed32000 {\n" "> +\t\t\tcompatible\t= \"st,asc\";\n" "> +\t\t\tstatus \t\t= \"disabled\";\n" "> +\t\t\treg\t\t= <0xfed32000 0x2c>;\n" @@ -124,7 +100,7 @@ "> +\t\t};\n" "> +\n" "> +\t\t/* SBC comms block ASCs in SASG1 */\n" - "> +\t\tsbc_uart1: uart@fe531000 {\n" + "> +\t\tsbc_uart1: uart at fe531000 {\n" "> +\t\t\tcompatible\t= \"st,asc\";\n" "> +\t\t\tstatus \t\t= \"disabled\";\n" "> +\t\t\treg\t\t= <0xfe531000 0x2c>;\n" @@ -251,4 +227,4 @@ "\n" "\tArnd" -cdcc0501372ff98a50081bc9c8623013851ff007a1cba63a25453714433e2780 +e3d7d01e1e732266e98531e7cfbe89f701c15b75635de83052b44238dd90d3e6
diff --git a/a/content_digest b/N2/content_digest index 482c46f..7c43832 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -27,7 +27,10 @@ Dong Aisheng <dong.aisheng@linaro.org> linux-doc@vger.kernel.org linux-kernel@vger.kernel.org - " devicetree-discuss@lists.ozlabs.org\0" + devicetree-discuss@lists.ozlabs.org + linux-arm-kernel@lists.infradead.org + linux-serial@vger.kernel.org + " Stephen Gallimore <stephen.gallimore@st.com>\0" "\00:1\0" "b\0" "On Wednesday 08 May 2013, Srinivas KANDAGATLA wrote:\n" @@ -251,4 +254,4 @@ "\n" "\tArnd" -cdcc0501372ff98a50081bc9c8623013851ff007a1cba63a25453714433e2780 +e2b545c98f84de0a701e73e5ff042b848873e61381c5ce37cb53243e2c6229b5
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.