diff for duplicates of <20120713064147.GG1122@atomide.com> diff --git a/a/1.txt b/N1/1.txt index 7e7de74..7373c46 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -38,7 +38,7 @@ Tony > Regards > Afzal > -> [1] http://www.mail-archive.com/linux-omap@vger.kernel.org/msg71644.html +> [1] http://www.mail-archive.com/linux-omap at vger.kernel.org/msg71644.html > [2] > diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi > index f46e353..08b2a5b 100644 @@ -49,7 +49,7 @@ Tony > ti,hwmods = "mmc3"; > }; > + -> + wdt2: wdt@44e35000 { +> + wdt2: wdt at 44e35000 { > + compatible = "ti,omap3-wdt"; > + ti,hwmods = "wd_timer2"; > + }; diff --git a/a/content_digest b/N1/content_digest index 2017e3e..1811276 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,9 @@ "ref\0pull-1341925556-888624\0" "ref\0C8443D0743D26F4388EA172BF4E2A7A93E9A8BE1@DBDE01.ent.ti.com\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [GIT PULL 1/5] omap device tree changes for v3.6 merge window\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0[GIT PULL 1/5] omap device tree changes for v3.6 merge window\0" "Date\0Thu, 12 Jul 2012 23:41:48 -0700\0" - "To\0Mohammed" - " Afzal <afzal@ti.com>\0" - "Cc\0Arnd Bergmann <arnd@arndb.de>" - Olof Johansson <olof@lixom.net> - linux-omap@vger.kernel.org <linux-omap@vger.kernel.org> - " linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "* Mohammed, Afzal <afzal@ti.com> [120712 23:19]:\n" @@ -51,7 +46,7 @@ "> Regards\n" "> Afzal\n" "> \n" - "> [1] http://www.mail-archive.com/linux-omap@vger.kernel.org/msg71644.html\n" + "> [1] http://www.mail-archive.com/linux-omap at vger.kernel.org/msg71644.html\n" "> [2]\n" "> diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi\n" "> index f46e353..08b2a5b 100644\n" @@ -62,11 +57,11 @@ "> ti,hwmods = \"mmc3\";\n" "> };\n" "> +\n" - "> + wdt2: wdt@44e35000 {\n" + "> + wdt2: wdt at 44e35000 {\n" "> + compatible = \"ti,omap3-wdt\";\n" "> + ti,hwmods = \"wd_timer2\";\n" "> + };\n" "> };\n" > }; -2aa6f0e4871be559ef11c75b298612f1474ecef681f73c20e2eb4428cc3ede3c +d6def03b5600e9704207710cf02862049f7bdb69d49b99f0142c7412e8a70ff0
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.