diff for duplicates of <20120711065149.GB1122@atomide.com> diff --git a/a/1.txt b/N1/1.txt index 4fa6447..3ce087f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,5 +1,5 @@ * Zumeng Chen <zumeng.chen@windriver.com> [120710 17:57]: -> 于 2012年07月10日 23:34, Arnd Bergmann 写道: +> ? 2012?07?10? 23:34, Arnd Bergmann ??: > >I got a conflict in arch/arm/mach-omap2/common-board-devices.c between > >16aced80f6739 "ARM: OMAP3530evm: set pendown_state and debounce time for > >ads7846" and 97ee9f01d6f26 "ARM: OMAP: fix the ads7846 init code", @@ -17,7 +17,3 @@ my testconfigs. Regards, Tony --- -To unsubscribe from this list: send the line "unsubscribe linux-omap" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index 8b28609..8ef5f2c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,19 +1,14 @@ "ref\00M4ZFU-1RqIwX3VUq-00yonj@mx.kundenserver.de\0" "ref\0201207101534.13166.arnd@arndb.de\0" "ref\04FFCCE43.2070709@windriver.com\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [GIT PULL 2/5] omap board changes for v3.6 merge window\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0[GIT PULL 2/5] omap board changes for v3.6 merge window\0" "Date\0Tue, 10 Jul 2012 23:51:49 -0700\0" - "To\0Zumeng Chen <zumeng.chen@windriver.com>\0" - "Cc\0Arnd Bergmann <arnd@arndb.de>" - Olof Johansson <olof@lixom.net> - linux-omap@vger.kernel.org - linux-arm-kernel@lists.infradead.org - " Igor Grinberg <grinberg@compulab.co.il>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "* Zumeng Chen <zumeng.chen@windriver.com> [120710 17:57]:\n" - "> \344\272\216 2012\345\271\26407\346\234\21010\346\227\245 23:34, Arnd Bergmann \345\206\231\351\201\223:\n" + "> ? 2012?07?10? 23:34, Arnd Bergmann ??:\n" "> >I got a conflict in arch/arm/mach-omap2/common-board-devices.c between\n" "> >16aced80f6739 \"ARM: OMAP3530evm: set pendown_state and debounce time for\n" "> >ads7846\" and 97ee9f01d6f26 \"ARM: OMAP: fix the ads7846 init code\",\n" @@ -30,10 +25,6 @@ "\n" "Regards,\n" "\n" - "Tony\n" - "--\n" - "To unsubscribe from this list: send the line \"unsubscribe linux-omap\" in\n" - "the body of a message to majordomo@vger.kernel.org\n" - More majordomo info at http://vger.kernel.org/majordomo-info.html + Tony -7cd18f91d04d180a022b822e1ffaa49e9216da4b7fd794b65983bf0e2897ce0d +61c5af11cf0d86c3f07eda316b54da200ebf5a8cb3cdaffee659f94acd1587a2
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.