diff for duplicates of <20120807071351.GK11011@atomide.com> diff --git a/a/1.txt b/N1/1.txt index 5aa3f21..709eb34 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -32,7 +32,7 @@ Subject: [PATCH] arm/dts: Fix am33xx wdt node Add am33xx wdt node. Signed-off-by: Afzal Mohammed <afzal@ti.com> -[tony@atomide.com: I messed up and produced an empty commit db27ac80 with stg apply] +[tony at atomide.com: I messed up and produced an empty commit db27ac80 with stg apply] Signed-off-by: Tony Lindgren <tony@atomide.com> diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi @@ -44,7 +44,7 @@ index 59509c4..bd0cff3 100644 ti,hwmods = "i2c3"; }; + -+ 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 cf9ca1b..5340b34 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,15 +2,10 @@ "ref\0C8443D0743D26F4388EA172BF4E2A7A93E9A8BE1@DBDE01.ent.ti.com\0" "ref\020120713064147.GG1122@atomide.com\0" "ref\020120713075658.GQ1122@atomide.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\0Tue, 7 Aug 2012 00:13:51 -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" "* Tony Lindgren <tony@atomide.com> [120713 01:01]:\n" @@ -47,7 +42,7 @@ "Add am33xx wdt node.\n" "\n" "Signed-off-by: Afzal Mohammed <afzal@ti.com>\n" - "[tony@atomide.com: I messed up and produced an empty commit db27ac80 with stg apply]\n" + "[tony at atomide.com: I messed up and produced an empty commit db27ac80 with stg apply]\n" "Signed-off-by: Tony Lindgren <tony@atomide.com>\n" "\n" "diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi\n" @@ -59,11 +54,11 @@ " \t\t\tti,hwmods = \"i2c3\";\n" " \t\t};\n" "+\n" - "+\t\twdt2: wdt@44e35000 {\n" + "+\t\twdt2: wdt at 44e35000 {\n" "+\t\t\tcompatible = \"ti,omap3-wdt\";\n" "+\t\t\tti,hwmods = \"wd_timer2\";\n" "+\t\t};\n" " \t};\n" }; -72e4b5f20cd35550d92ac11569785393eb0ae35417aebba5f5928b86695610a8 +1d7c9d4c9e7c99860374c615929684dace12a890c31dfdb6d8b4d12719de6a1a
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.