diff for duplicates of <20130506233743.GJ28721@atomide.com> diff --git a/a/1.txt b/N1/1.txt index e662c61..1084f3c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -23,7 +23,7 @@ Without the omap_clk_init() calls none of OMAP family of devices boot. Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com> -[tony@atomide.com: updated comments to describe merge error] +[tony at atomide.com: updated comments to describe merge error] Signed-off-by: Tony Lindgren <tony@atomide.com> --- a/arch/arm/mach-omap2/timer.c diff --git a/a/content_digest b/N1/content_digest index 4a7d73b..9dc461f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,10 @@ "ref\079CD15C6BA57404B839C016229A409A83EC7C45D@DBDE04.ent.ti.com\0" "ref\020130506152706.GD28721@atomide.com\0" "ref\079CD15C6BA57404B839C016229A409A83EC7C93A@DBDE04.ent.ti.com\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: mach-omap2/timer.c: Bug introduced while merging patch - ff931c82\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0mach-omap2/timer.c: Bug introduced while merging patch - ff931c82\0" "Date\0Mon, 6 May 2013 16:37:43 -0700\0" - "To\0Hiremath" - " Vaibhav <hvaibhav@ti.com>\0" - "Cc\0linux-omap@vger.kernel.org <linux-omap@vger.kernel.org>" - linux-kernel@vger.kernel.org <linux-kernel@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" "* Hiremath, Vaibhav <hvaibhav@ti.com> [130506 11:35]:\n" @@ -36,7 +32,7 @@ "boot.\n" "\n" "Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>\n" - "[tony@atomide.com: updated comments to describe merge error]\n" + "[tony at atomide.com: updated comments to describe merge error]\n" "Signed-off-by: Tony Lindgren <tony@atomide.com>\n" "\n" "--- a/arch/arm/mach-omap2/timer.c\n" @@ -60,4 +56,4 @@ " \tomap2_gp_clockevent_init((clkev_nr), clkev_src, clkev_prop);\t\\\n" " \t/* Enable the use of clocksource=\"gp_timer\" kernel parameter */\t\\" -99a44c97192b47f5cf71dfa5bd97a2236aec8eb594fe1ca8dbeb3f1b80e95876 +2865575388b25168f487c3b74016ac8bc5f1eb2043d2644e56a72371ec18b305
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.