diff for duplicates of <f91ba888fc325f37074be0e5ba0fba5d55a78783.1402303821.git.jslaby@suse.cz>
diff --git a/a/content_digest b/N1/content_digest
index f92056d..1048484 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -17,13 +17,13 @@
"To\0stable\@vger.kernel.org\0"
]
[
- "Cc\0linux-kernel\@vger.kernel.org",
- " Leif Lindholm <leif.lindholm\@linaro.org>",
- " linux-arm-kernel\@lists.infradead.org",
+ "Cc\0Mark Rutland <mark.rutland\@arm.com>",
" devicetree\@vger.kernel.org",
- " Mark Rutland <mark.rutland\@arm.com>",
+ " linux-kernel\@vger.kernel.org",
+ " Leif Lindholm <leif.lindholm\@linaro.org>",
" Grant Likely <grant.likely\@linaro.org>",
- " Jiri Slaby <jslaby\@suse.cz>\0"
+ " Jiri Slaby <jslaby\@suse.cz>",
+ " linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -72,4 +72,4 @@
"1.9.3"
]
-b6947ed1b28883dea81851724b45c77d15b5e1f836b95b2f40008bc6fd507adc
+aebaae11068846a243f3a627ac89ce8e451cdd1a488e0afe546d559d2abb7e13
diff --git a/a/1.txt b/N2/1.txt
index 3e3fd7b..bc91ab6 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -13,8 +13,8 @@ memory. Fix the data so that all parsing code can handle it correctly.
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
Acked-by: Lee Jones <lee.jones@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
-Cc: linux-arm-kernel@lists.infradead.org
-Cc: devicetree@vger.kernel.org
+Cc: linux-arm-kernel at lists.infradead.org
+Cc: devicetree at vger.kernel.org
Cc: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Grant Likely <grant.likely@linaro.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
@@ -29,7 +29,7 @@ index 7f3baf51a3a9..32dd55e5f4e6 100644
@@ -18,6 +18,7 @@
compatible = "st-ericsson,ccu8540", "st-ericsson,u8540";
- memory@0 {
+ memory at 0 {
+ device_type = "memory";
reg = <0x20000000 0x1f000000>, <0xc0000000 0x3f000000>;
};
diff --git a/a/content_digest b/N2/content_digest
index f92056d..6b0f6a3 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -2,10 +2,7 @@
"ref\0ebe219e45dcf94c1a34281167427cff4d742faef.1402303820.git.jslaby\@suse.cz\0"
]
[
- "ref\0cover.1402303820.git.jslaby\@suse.cz\0"
-]
-[
- "From\0Jiri Slaby <jslaby\@suse.cz>\0"
+ "From\0jslaby\@suse.cz (Jiri Slaby)\0"
]
[
"Subject\0[PATCH 3.12 075/146] arm: dts: Fix missing device_type=\"memory\" for ste-ccu8540\0"
@@ -14,16 +11,7 @@
"Date\0Mon, 9 Jun 2014 10:50:10 +0200\0"
]
[
- "To\0stable\@vger.kernel.org\0"
-]
-[
- "Cc\0linux-kernel\@vger.kernel.org",
- " Leif Lindholm <leif.lindholm\@linaro.org>",
- " linux-arm-kernel\@lists.infradead.org",
- " devicetree\@vger.kernel.org",
- " Mark Rutland <mark.rutland\@arm.com>",
- " Grant Likely <grant.likely\@linaro.org>",
- " Jiri Slaby <jslaby\@suse.cz>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -47,8 +35,8 @@
"Signed-off-by: Leif Lindholm <leif.lindholm\@linaro.org>\n",
"Acked-by: Lee Jones <lee.jones\@linaro.org>\n",
"Acked-by: Linus Walleij <linus.walleij\@linaro.org>\n",
- "Cc: linux-arm-kernel\@lists.infradead.org\n",
- "Cc: devicetree\@vger.kernel.org\n",
+ "Cc: linux-arm-kernel at lists.infradead.org\n",
+ "Cc: devicetree at vger.kernel.org\n",
"Cc: Mark Rutland <mark.rutland\@arm.com>\n",
"Signed-off-by: Grant Likely <grant.likely\@linaro.org>\n",
"Signed-off-by: Jiri Slaby <jslaby\@suse.cz>\n",
@@ -63,7 +51,7 @@
"\@\@ -18,6 +18,7 \@\@\n",
" \tcompatible = \"st-ericsson,ccu8540\", \"st-ericsson,u8540\";\n",
" \n",
- " \tmemory\@0 {\n",
+ " \tmemory at 0 {\n",
"+\t\tdevice_type = \"memory\";\n",
" \t\treg = <0x20000000 0x1f000000>, <0xc0000000 0x3f000000>;\n",
" \t};\n",
@@ -72,4 +60,4 @@
"1.9.3"
]
-b6947ed1b28883dea81851724b45c77d15b5e1f836b95b2f40008bc6fd507adc
+71bb5d769a7807216e07bc566663ba2834b2d7c2ed4593cec253b1629b75b328
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.