diff for duplicates of <20171031021650.GC6270@dragon> diff --git a/a/1.txt b/N1/1.txt index 9b54fbd..b3e8579 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -30,7 +30,7 @@ Shawn > Cyrille > > -> Le 30/10/2017 à 19:15, Mark Brown a écrit : +> Le 30/10/2017 ? 19:15, Mark Brown a ?crit : > > Hi Cyrille, > > > > Today's linux-next merge of the spi-nor tree got a conflict in: diff --git a/a/content_digest b/N1/content_digest index 7e4c56a..f38ff81 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,19 +1,9 @@ "ref\020171030181551.skcvt4mr4br7rtn2@sirena.co.uk\0" "ref\0d38cf683-c7a8-51b1-896a-ff1fda0f64f9@wedev4u.fr\0" - "From\0Shawn Guo <shawnguo@kernel.org>\0" - "Subject\0Re: linux-next: manual merge of the spi-nor tree with the imx-mxs tree\0" + "From\0shawnguo@kernel.org (Shawn Guo)\0" + "Subject\0linux-next: manual merge of the spi-nor tree with the imx-mxs tree\0" "Date\0Tue, 31 Oct 2017 10:16:52 +0800\0" - "To\0Cyrille Pitchen <cyrille.pitchen@wedev4u.fr>" - " Arnd Bergmann <arnd@arndb.de>\0" - "Cc\0Mark Brown <broonie@kernel.org>" - Yuan Yao <yao.yuan@nxp.com> - Hou Zhiqiang <Zhiqiang.Hou@nxp.com> - Rob Herring <robh@kernel.org> - Philipp Puschmann <pp@emlix.com> - linux-arm-kernel@lists.infradead.org - Linux-Next Mailing List <linux-next@vger.kernel.org> - Linux Kernel Mailing List <linux-kernel@vger.kernel.org> - " Marek Vasut <marek.vasut@gmail.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Tue, Oct 31, 2017 at 01:42:30AM +0100, Cyrille Pitchen wrote:\n" @@ -48,7 +38,7 @@ "> Cyrille\n" "> \n" "> \n" - "> Le 30/10/2017 \303\240 19:15, Mark Brown a \303\251crit :\n" + "> Le 30/10/2017 ? 19:15, Mark Brown a ?crit :\n" "> > Hi Cyrille,\n" "> > \n" "> > Today's linux-next merge of the spi-nor tree got a conflict in:\n" @@ -88,4 +78,4 @@ "> > \n" > -4015d889fe5d5fa017cf1914db51c11531c2837af4c593e20bcfb893fe0a58c7 +a27f900e6cffd8177da22d450523145f70771b6e8bf635e46676e16f8db7d275
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.