diff for duplicates of <555C3AAC.40101@atmel.com> diff --git a/a/1.txt b/N1/1.txt index 4965872..e28db3e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,4 +1,4 @@ -Le 20/05/2015 02:08, Stephen Rothwell a écrit : +Le 20/05/2015 02:08, 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 4e72640..c5389de 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,18 +1,11 @@ "ref\020150520100851.2e485c02@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\0Wed, 20 May 2015 09:41:32 +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 - Alexandre Belloni <alexandre.belloni@free-electrons.com> - " Ard Biesheuvel <ard.biesheuvel@linaro.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" - "Le 20/05/2015 02:08, Stephen Rothwell a \303\251crit :\n" + "Le 20/05/2015 02:08, Stephen Rothwell a ?crit :\n" "> Hi Nicolas,\n" "> \n" "> Today's linux-next merge of the at91 tree got a conflict in\n" @@ -30,4 +23,4 @@ "-- \n" Nicolas Ferre -2842f2b62a55c8a165f1ce86451d61afa0c30b87608a91344a81daa2fdae82a4 +fd674f844dc58528e3b9d7f2ac494486d53e8c3f0e651dcdf16d0dbea5e75b2b
diff --git a/a/content_digest b/N2/content_digest index 4e72640..a727ce3 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> Alexandre Belloni <alexandre.belloni@free-electrons.com> " Ard Biesheuvel <ard.biesheuvel@linaro.org>\0" "\00:1\0" @@ -30,4 +30,4 @@ "-- \n" Nicolas Ferre -2842f2b62a55c8a165f1ce86451d61afa0c30b87608a91344a81daa2fdae82a4 +273bf0765313462ddee19f2f3d2685e761c190c78315c768283d555c820c6df7
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.