diff for duplicates of <55BB1F1C.6000501@atmel.com> diff --git a/a/1.txt b/N1/1.txt index b2a3360..d9cc3ea 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,4 +1,4 @@ -Le 31/07/2015 00:38, Stephen Rothwell a écrit : +Le 31/07/2015 00:38, Stephen Rothwell a ?crit : > Hi Nicolas, > > Today's linux-next merge of the at91 tree got a conflict in: diff --git a/a/content_digest b/N1/content_digest index 3557e64..aafd854 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,17 +1,11 @@ "ref\020150731083803.71c9d466@canb.auug.org.au\0" - "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" - "Subject\0Re: linux-next: manual merge of the at91 tree with the arm-soc tree\0" + "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0" + "Subject\0linux-next: manual merge of the at91 tree with the arm-soc tree\0" "Date\0Fri, 31 Jul 2015 09:09:16 +0200\0" - "To\0Stephen Rothwell <sfr@canb.auug.org.au>" - Olof Johansson <olof@lixom.net> - Arnd Bergmann <arnd@arndb.de> - " linux-arm-kernel@lists.infradead.org\0" - "Cc\0linux-next@vger.kernel.org" - linux-kernel@vger.kernel.org - " Nicolas Pitre <nicolas.pitre@linaro.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" - "Le 31/07/2015 00:38, Stephen Rothwell a \303\251crit :\n" + "Le 31/07/2015 00:38, Stephen Rothwell a ?crit :\n" "> Hi Nicolas,\n" "> \n" "> Today's linux-next merge of the at91 tree got a conflict in:\n" @@ -37,4 +31,4 @@ "-- \n" Nicolas Ferre -1ac2ae2da1e27a3157c705342e3bd542b75211fd3d76ded54bc82591030f111a +bf6fde228215c58cc4f2aa7ecb648f4c02447f4d9a83f05b7367835fa6999fcd
diff --git a/a/content_digest b/N2/content_digest index 3557e64..fbdd25c 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -5,9 +5,9 @@ "To\0Stephen Rothwell <sfr@canb.auug.org.au>" Olof Johansson <olof@lixom.net> Arnd Bergmann <arnd@arndb.de> - " linux-arm-kernel@lists.infradead.org\0" - "Cc\0linux-next@vger.kernel.org" - linux-kernel@vger.kernel.org + " <linux-arm-kernel@lists.infradead.org>\0" + "Cc\0<linux-next@vger.kernel.org>" + <linux-kernel@vger.kernel.org> " Nicolas Pitre <nicolas.pitre@linaro.org>\0" "\00:1\0" "b\0" @@ -37,4 +37,4 @@ "-- \n" Nicolas Ferre -1ac2ae2da1e27a3157c705342e3bd542b75211fd3d76ded54bc82591030f111a +794e020a12a8d65f6b3c7a078eb0d0d71d3657bcd4b30e7ed09c94a6d917987a
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.