diff for duplicates of <20151130211738.GR2517@atomide.com> diff --git a/a/1.txt b/N1/1.txt index fca16dc..8bacc12 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -19,7 +19,7 @@ Tony > #interrupt-cells = <2>; > }; > -> + elm: elm@48078000 { +> + elm: elm at 48078000 { > + compatible = "ti,am3352-elm"; > + reg = <0x48078000 0x2000>; > + interrupts = <4>; @@ -27,7 +27,7 @@ Tony > + status = "disabled"; > + }; > + -> gpmc: gpmc@50000000 { +> gpmc: gpmc at 50000000 { > compatible = "ti,omap4430-gpmc"; > reg = <0x50000000 0x1000>; > -- diff --git a/a/content_digest b/N1/content_digest index e470893..0651c9f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,16 +1,9 @@ "ref\01446066137-11527-1-git-send-email-fcooper@ti.com\0" "ref\01446066137-11527-2-git-send-email-fcooper@ti.com\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [PATCH 1/2] ARM: dts: omap4: Add elm node\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0[PATCH 1/2] ARM: dts: omap4: Add elm node\0" "Date\0Mon, 30 Nov 2015 13:17:38 -0800\0" - "To\0Franklin S Cooper Jr <fcooper@ti.com>\0" - "Cc\0linux-kernel@vger.kernel.org" - linux-arm-kernel@lists.infradead.org - linux-omap@vger.kernel.org - linux@arm.linux.org.uk - rogerq@ti.com - nm@ti.com - " lokeshvutla@ti.com\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "* Franklin S Cooper Jr <fcooper@ti.com> [151028 14:02]:\n" @@ -34,7 +27,7 @@ "> \t\t\t#interrupt-cells = <2>;\n" "> \t\t};\n" "> \n" - "> +\t\telm: elm@48078000 {\n" + "> +\t\telm: elm at 48078000 {\n" "> +\t\t\tcompatible = \"ti,am3352-elm\";\n" "> +\t\t\treg = <0x48078000 0x2000>;\n" "> +\t\t\tinterrupts = <4>;\n" @@ -42,11 +35,11 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> \t\tgpmc: gpmc@50000000 {\n" + "> \t\tgpmc: gpmc at 50000000 {\n" "> \t\t\tcompatible = \"ti,omap4430-gpmc\";\n" "> \t\t\treg = <0x50000000 0x1000>;\n" "> -- \n" "> 2.6.1\n" > -aedc8d5ed94c04dcea223e92b4e9ebd8bdb8341539ed8fff6f13942eb03eac09 +c2b42f1b20a7d409cf57173a8f8fac67ab4b5d68a698a7aeee84308d40ac63ec
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.