diff for duplicates of <555C3BB4.2000802@atmel.com> diff --git a/a/1.txt b/N1/1.txt index 4e251d0..0114eaa 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,4 +1,4 @@ -Le 20/05/2015 02:27, Stephen Rothwell a écrit : +Le 20/05/2015 02:27, Stephen Rothwell a ?crit : > Hi Kukjin, > > Today's linux-next merge of the samsung tree got a conflict in diff --git a/a/content_digest b/N1/content_digest index 106422d..ba98e2c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,26 +1,11 @@ "ref\020150520102743.3d336a73@canb.auug.org.au\0" - "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" - "Subject\0Re: linux-next: manual merge of the samsung tree with the arm-soc and at91 trees\0" + "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0" + "Subject\0linux-next: manual merge of the samsung tree with the arm-soc and at91 trees\0" "Date\0Wed, 20 May 2015 09:45:56 +0200\0" - "To\0Stephen Rothwell <sfr@canb.auug.org.au>" - Kukjin Kim <kgene.kim@samsung.com> - 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> - Geert Uytterhoeven <geert+renesas@glider.be> - Masahiro Yamada <yamada.masahiro@socionext.com> - Lee Jones <lee.jones@linaro.org> - Maxime Coquelin <maxime.coquelin@st.com> - Baruch Siach <baruch@tkos.co.il> - Krzysztof Kozlowski <k.kozlowski.k@gmail.com> - " Javier Martinez Canillas <javier.martinez@collabora.co.uk>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" - "Le 20/05/2015 02:27, Stephen Rothwell a \303\251crit :\n" + "Le 20/05/2015 02:27, Stephen Rothwell a ?crit :\n" "> Hi Kukjin,\n" "> \n" "> Today's linux-next merge of the samsung tree got a conflict in\n" @@ -34,4 +19,4 @@ "-- \n" Nicolas Ferre -4c3f466ba07585f0d5b93132b4436312b2b4484cc938544a22cb1e7a48998c03 +ed586073e3126a44dcb5e0c5cf89d57b1acc7133c47ca6f60ef7bdf5ab18a475
diff --git a/a/content_digest b/N2/content_digest index 106422d..41a6967 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -6,9 +6,9 @@ Kukjin Kim <kgene.kim@samsung.com> 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> Geert Uytterhoeven <geert+renesas@glider.be> @@ -34,4 +34,4 @@ "-- \n" Nicolas Ferre -4c3f466ba07585f0d5b93132b4436312b2b4484cc938544a22cb1e7a48998c03 +286d312c620613d39fc740e8ef90449d1991e3ab7db5693a411af1698dde25c8
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.