diff for duplicates of <201206251850.10839.marex@denx.de>
diff --git a/a/content_digest b/N1/content_digest
index cc41ec5..7ae5312 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,10 +8,7 @@
"ref\00020120625161506.GH2342\@S2101-09.ap.freescale.net\0"
]
[
- "ref\00020120625161506.GH2342-rvtDTF3kK1ictlrPMvKcciBecyulp+rMXqFh9Ls21Oc\@public.gmane.org\0"
-]
-[
- "From\0Marek Vasut <marex-ynQEQJNshbs\@public.gmane.org>\0"
+ "From\0Marek Vasut <marex\@denx.de>\0"
]
[
"Subject\0Re: [PATCH] mtd/m25p80: add device tree probe support\0"
@@ -20,14 +17,16 @@
"Date\0Mon, 25 Jun 2012 18:50:10 +0200\0"
]
[
- "To\0Shawn Guo <shawn.guo-QSEj5FYQhm4dnm+yROfE0A\@public.gmane.org>\0"
+ "To\0Shawn Guo <shawn.guo\@linaro.org>\0"
]
[
- "Cc\0patches-QSEj5FYQhm4dnm+yROfE0A\@public.gmane.org",
- " devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ\@public.gmane.org",
- " linux-mtd-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r\@public.gmane.org",
- " Artem Bityutskiy <artem.bityutskiy-ral2JQCrhuEAvxtiuMwx3w\@public.gmane.org>",
- " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r\@public.gmane.org\0"
+ "Cc\0manu <manuel.pezzin\@free.fr>",
+ " patches\@linaro.org",
+ " devicetree-discuss\@lists.ozlabs.org",
+ " Grant Likely <grant.likely\@secretlab.ca>",
+ " linux-mtd\@lists.infradead.org",
+ " Artem Bityutskiy <artem.bityutskiy\@intel.com>",
+ " linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -78,4 +77,4 @@
"Marek Vasut"
]
-1ea0d0a27535f99fc541e6e15975d14dba3a43c7d8de36631c9767f4ef2de31b
+efa357698dd2d0d47467194f2f8109393b136accb240cd13991bf39d34b545f6
diff --git a/a/1.txt b/N2/1.txt
index 91eef91..42214e3 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -17,7 +17,7 @@ Dear Shawn Guo,
> retest, and if it's true that the patch is not necessarily needed,
> I will probably let it be.
-116 ssp2: ssp@80014000 {
+116 ssp2: ssp at 80014000 {
117 #address-cells = <1>;
118 #size-cells = <0>;
119 compatible = "fsl,imx28-spi";
@@ -25,7 +25,7 @@ Dear Shawn Guo,
121 pinctrl-0 = <&spi2_pins_a>;
122 status = "okay";
123
-124 flash: m25p80@0 {
+124 flash: m25p80 at 0 {
125 #address-cells = <1>;
126 #size-cells = <1>;
127 compatible = "m25p80";
diff --git a/a/content_digest b/N2/content_digest
index cc41ec5..f62e38d 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -8,26 +8,16 @@
"ref\00020120625161506.GH2342\@S2101-09.ap.freescale.net\0"
]
[
- "ref\00020120625161506.GH2342-rvtDTF3kK1ictlrPMvKcciBecyulp+rMXqFh9Ls21Oc\@public.gmane.org\0"
+ "From\0marex\@denx.de (Marek Vasut)\0"
]
[
- "From\0Marek Vasut <marex-ynQEQJNshbs\@public.gmane.org>\0"
-]
-[
- "Subject\0Re: [PATCH] mtd/m25p80: add device tree probe support\0"
+ "Subject\0[PATCH] mtd/m25p80: add device tree probe support\0"
]
[
"Date\0Mon, 25 Jun 2012 18:50:10 +0200\0"
]
[
- "To\0Shawn Guo <shawn.guo-QSEj5FYQhm4dnm+yROfE0A\@public.gmane.org>\0"
-]
-[
- "Cc\0patches-QSEj5FYQhm4dnm+yROfE0A\@public.gmane.org",
- " devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ\@public.gmane.org",
- " linux-mtd-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r\@public.gmane.org",
- " Artem Bityutskiy <artem.bityutskiy-ral2JQCrhuEAvxtiuMwx3w\@public.gmane.org>",
- " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r\@public.gmane.org\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -55,7 +45,7 @@
"> retest, and if it's true that the patch is not necessarily needed,\n",
"> I will probably let it be.\n",
"\n",
- "116 ssp2: ssp\@80014000 {\n",
+ "116 ssp2: ssp at 80014000 {\n",
"117 #address-cells = <1>;\n",
"118 #size-cells = <0>;\n",
"119 compatible = \"fsl,imx28-spi\";\n",
@@ -63,7 +53,7 @@
"121 pinctrl-0 = <&spi2_pins_a>;\n",
"122 status = \"okay\";\n",
"123 \n",
- "124 flash: m25p80\@0 {\n",
+ "124 flash: m25p80 at 0 {\n",
"125 #address-cells = <1>;\n",
"126 #size-cells = <1>;\n",
"127 compatible = \"m25p80\";\n",
@@ -78,4 +68,4 @@
"Marek Vasut"
]
-1ea0d0a27535f99fc541e6e15975d14dba3a43c7d8de36631c9767f4ef2de31b
+915152d97f7d74462fe4013727fb6ce47c94d3e044275df3284bada784e64c8b
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.