diff for duplicates of <532183A4.5020600@gmail.com> diff --git a/a/1.txt b/N1/1.txt index d689903..a78ddb9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,5 +1,5 @@ -On 03/12/2014 11:06 AM, Antoine T?nart wrote: -> Signed-off-by: Antoine T?nart <antoine.tenart@free-electrons.com> +On 03/12/2014 11:06 AM, Antoine Ténart wrote: +> Signed-off-by: Antoine Ténart <antoine.tenart@free-electrons.com> > --- > arch/arm/boot/dts/Makefile | 3 ++- > arch/arm/boot/dts/berlin2q-dmp.dts | 32 ++++++++++++++++++++++++++++++++ @@ -31,7 +31,7 @@ berlin2q-marvell-dmp.dtb. > +++ b/arch/arm/boot/dts/berlin2q-dmp.dts > @@ -0,0 +1,32 @@ > +/* -> + * Copyright (C) 2014 Antoine T?nart <antoine.tenart@free-electrons.com> +> + * Copyright (C) 2014 Antoine Ténart <antoine.tenart@free-electrons.com> > + * > + * This file is licensed under the terms of the GNU General Public > + * License version 2. This program is licensed "as is" without any @@ -58,8 +58,8 @@ Please double-check Jisheng's comment about memory size. > + }; > + > + soc { -> + apb at fc0000 { -> + uart0: uart at 9000 { +> + apb@fc0000 { +> + uart0: uart@9000 { > + status = "okay"; > + }; > + }; diff --git a/a/content_digest b/N1/content_digest index 9741ed7..697fd36 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,13 +1,18 @@ "ref\01394622364-6848-1-git-send-email-antoine.tenart@free-electrons.com\0" "ref\01394622364-6848-3-git-send-email-antoine.tenart@free-electrons.com\0" - "From\0sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth)\0" - "Subject\0[PATCH 2/2] ARM: dts: berlin2q: add the Marvell BG2-Q DMP device tree\0" + "From\0Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0" + "Subject\0Re: [PATCH 2/2] ARM: dts: berlin2q: add the Marvell BG2-Q DMP device tree\0" "Date\0Thu, 13 Mar 2014 10:08:36 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Antoine T\303\251nart <antoine.tenart@free-electrons.com>\0" + "Cc\0alexandre.belloni@free-electrons.com" + zmxu@marvell.com + jszhang@marvell.com + linux-arm-kernel@lists.infradead.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" - "On 03/12/2014 11:06 AM, Antoine T?nart wrote:\n" - "> Signed-off-by: Antoine T?nart <antoine.tenart@free-electrons.com>\n" + "On 03/12/2014 11:06 AM, Antoine T\303\251nart wrote:\n" + "> Signed-off-by: Antoine T\303\251nart <antoine.tenart@free-electrons.com>\n" "> ---\n" "> arch/arm/boot/dts/Makefile | 3 ++-\n" "> arch/arm/boot/dts/berlin2q-dmp.dts | 32 ++++++++++++++++++++++++++++++++\n" @@ -39,7 +44,7 @@ "> +++ b/arch/arm/boot/dts/berlin2q-dmp.dts\n" "> @@ -0,0 +1,32 @@\n" "> +/*\n" - "> + * Copyright (C) 2014 Antoine T?nart <antoine.tenart@free-electrons.com>\n" + "> + * Copyright (C) 2014 Antoine T\303\251nart <antoine.tenart@free-electrons.com>\n" "> + *\n" "> + * This file is licensed under the terms of the GNU General Public\n" "> + * License version 2. This program is licensed \"as is\" without any\n" @@ -66,8 +71,8 @@ "> +\t};\n" "> +\n" "> +\tsoc {\n" - "> +\t\tapb at fc0000 {\n" - "> +\t\t\tuart0: uart at 9000 {\n" + "> +\t\tapb@fc0000 {\n" + "> +\t\t\tuart0: uart@9000 {\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t};\n" "> +\t\t};\n" @@ -82,4 +87,4 @@ "> +};\n" > -f61778ecd37f18a32ee7063d5330ede312b9be3d24cb59e67714e39454e0bcaf +78b20c72b72bcc449e1dab8f2249bb5997787a1000c3d08e0e5037814a85abe9
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.