diff for duplicates of <4F6B3C9D.60300@atmel.com> diff --git a/a/1.txt b/N1/1.txt index 582b08d..1e3baf8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,4 +1,4 @@ -On 03/21/2012 07:03 PM, ludovic.desroches@atmel.com : +On 03/21/2012 07:03 PM, ludovic.desroches at atmel.com : > From: Ludovic Desroches <ludovic.desroches@atmel.com> > > Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com> @@ -18,14 +18,14 @@ Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> > status = "disabled"; > }; > + -> + mmc0: mmc@f0008000 { +> + mmc0: mmc at f0008000 { > + compatible = "atmel,hsmci"; > + reg = <0xf0008000 0x600>; > + interrupts = <12 4>; > + status = "disabled"; > + }; > + -> + mmc1: mmc@f000c000 { +> + mmc1: mmc at f000c000 { > + compatible = "atmel,hsmci"; > + reg = <0xf000c000 0x600>; > + interrupts = <26 4>; @@ -33,7 +33,7 @@ Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> > + }; > }; > -> nand0: nand@40000000 { +> nand0: nand at 40000000 { -- diff --git a/a/content_digest b/N1/content_digest index 2ad2d92..a110257 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,16 +1,12 @@ "ref\01332352994-20983-1-git-send-email-ludovic.desroches@atmel.com\0" "ref\01332352994-20983-4-git-send-email-ludovic.desroches@atmel.com\0" - "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" - "Subject\0Re: [PATCH 3/4] arm: at91: dt: sam9x5 add mci support\0" + "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0" + "Subject\0[PATCH 3/4] arm: at91: dt: sam9x5 add mci support\0" "Date\0Thu, 22 Mar 2012 15:52:13 +0100\0" - "To\0ludovic.desroches@atmel.com\0" - "Cc\0linux-mmc@vger.kernel.org" - linux-arm-kernel@lists.infradead.org - plagnioj@jcrosoft.com - " devicetree-discuss <devicetree-discuss@lists.ozlabs.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" - "On 03/21/2012 07:03 PM, ludovic.desroches@atmel.com :\n" + "On 03/21/2012 07:03 PM, ludovic.desroches at atmel.com :\n" "> From: Ludovic Desroches <ludovic.desroches@atmel.com>\n" "> \n" "> Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>\n" @@ -30,14 +26,14 @@ "> \t\t\t\tstatus = \"disabled\";\n" "> \t\t\t};\n" "> +\n" - "> +\t\t\tmmc0: mmc@f0008000 {\n" + "> +\t\t\tmmc0: mmc at f0008000 {\n" "> +\t\t\t\tcompatible = \"atmel,hsmci\";\n" "> +\t\t\t\treg = <0xf0008000 0x600>;\n" "> +\t\t\t\tinterrupts = <12 4>;\n" "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tmmc1: mmc@f000c000 {\n" + "> +\t\t\tmmc1: mmc at f000c000 {\n" "> +\t\t\t\tcompatible = \"atmel,hsmci\";\n" "> +\t\t\t\treg = <0xf000c000 0x600>;\n" "> +\t\t\t\tinterrupts = <26 4>;\n" @@ -45,10 +41,10 @@ "> +\t\t\t};\n" "> \t\t};\n" "> \n" - "> \t\tnand0: nand@40000000 {\n" + "> \t\tnand0: nand at 40000000 {\n" "\n" "\n" "-- \n" Nicolas Ferre -7948143550852c518a92b371b1fe560e640bacfc650a39db656310fa65188823 +61439d3e8374c128a2a4b89e7c2e3f13468cb258b037709192f3744f28949468
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.