diff for duplicates of <1452619291-13625-10-git-send-email-LW@KARO-electronics.de>
diff --git a/a/1.txt b/N1/1.txt
index 07fb1cb..cf847e2 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -26,4 +26,10 @@ index a578b23..96b78a9 100644
compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";
reg = <0x020f0000 0x4000>;
--
-2.1.4
\ No newline at end of file
+2.1.4
+
+
+_______________________________________________
+linux-arm-kernel mailing list
+linux-arm-kernel@lists.infradead.org
+http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 0df9e0f..bf34161 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -85,7 +85,13 @@
" \t\t\t\tcompatible = \"fsl,imx6ul-pwm\", \"fsl,imx27-pwm\";\n",
" \t\t\t\treg = <0x020f0000 0x4000>;\n",
"-- \n",
- "2.1.4"
+ "2.1.4\n",
+ "\n",
+ "\n",
+ "_______________________________________________\n",
+ "linux-arm-kernel mailing list\n",
+ "linux-arm-kernel\@lists.infradead.org\n",
+ "http://lists.infradead.org/mailman/listinfo/linux-arm-kernel"
]
-b685b2d9d5099be8e0ffd066b9f8978ae0f0490f82b497e913b16d838819c1d9
+6c53063f2418ee678e061b2c14393cc07452d8af050b31623a6ab095d2ea265f
diff --git a/a/1.txt b/N2/1.txt
index 07fb1cb..1b9c388 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -1,4 +1,4 @@
-Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
+Signed-off-by: Lothar Wa?mann <LW@KARO-electronics.de>
---
arch/arm/boot/dts/imx6ul.dtsi | 11 +++++++++++
1 file changed, 11 insertions(+)
@@ -11,7 +11,7 @@ index a578b23..96b78a9 100644
clock-names = "ipg", "per";
};
-+ sdma: sdma@020ec000 {
++ sdma: sdma at 020ec000 {
+ compatible = "fsl,imx6q-sdma", "fsl,imx35-sdma";
+ reg = <0x020ec000 0x4000>;
+ interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
@@ -22,7 +22,7 @@ index a578b23..96b78a9 100644
+ fsl,sdma-ram-script-name = "imx/sdma/sdma-imx6q.bin";
+ };
+
- pwm5: pwm@020f0000 {
+ pwm5: pwm at 020f0000 {
compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";
reg = <0x020f0000 0x4000>;
--
diff --git a/a/content_digest b/N2/content_digest
index 0df9e0f..a80e874 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -26,7 +26,7 @@
"ref\0001452619291-13625-9-git-send-email-LW\@KARO-electronics.de\0"
]
[
- "From\0Lothar Wa\303\237mann <LW\@karo-electronics.de>\0"
+ "From\0LW\@karo-electronics.de (Lothar Wa\303\237mann)\0"
]
[
"Subject\0[PATCH 09/14] ARM: dts: imx6ul: add sdma support\0"
@@ -35,20 +35,7 @@
"Date\0Tue, 12 Jan 2016 18:21:26 +0100\0"
]
[
- "To\0Ian Campbell <ijc+devicetree\@hellion.org.uk>",
- " Kumar Gala <galak\@codeaurora.org>",
- " Mark Rutland <mark.rutland\@arm.com>",
- " Pawel Moll <pawel.moll\@arm.com>",
- " Rob Herring <robh+dt\@kernel.org>",
- " Russell King <linux\@arm.linux.org.uk>",
- " Sascha Hauer <kernel\@pengutronix.de>",
- " Shawn Guo <shawnguo\@kernel.org>",
- " devicetree\@vger.kernel.org",
- " linux-arm-kernel\@lists.infradead.org",
- " linux-kernel\@vger.kernel.org\0"
-]
-[
- "Cc\0Lothar Wa\303\237mann <LW\@karo-electronics.de>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -57,7 +44,7 @@
"b\0"
]
[
- "Signed-off-by: Lothar Wa\303\237mann <LW\@KARO-electronics.de>\n",
+ "Signed-off-by: Lothar Wa?mann <LW\@KARO-electronics.de>\n",
"---\n",
" arch/arm/boot/dts/imx6ul.dtsi | 11 +++++++++++\n",
" 1 file changed, 11 insertions(+)\n",
@@ -70,7 +57,7 @@
" \t\t\t\tclock-names = \"ipg\", \"per\";\n",
" \t\t\t};\n",
" \n",
- "+\t\t\tsdma: sdma\@020ec000 {\n",
+ "+\t\t\tsdma: sdma at 020ec000 {\n",
"+\t\t\t\tcompatible = \"fsl,imx6q-sdma\", \"fsl,imx35-sdma\";\n",
"+\t\t\t\treg = <0x020ec000 0x4000>;\n",
"+\t\t\t\tinterrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;\n",
@@ -81,11 +68,11 @@
"+\t\t\t\tfsl,sdma-ram-script-name = \"imx/sdma/sdma-imx6q.bin\";\n",
"+\t\t\t};\n",
"+\n",
- " \t\t\tpwm5: pwm\@020f0000 {\n",
+ " \t\t\tpwm5: pwm at 020f0000 {\n",
" \t\t\t\tcompatible = \"fsl,imx6ul-pwm\", \"fsl,imx27-pwm\";\n",
" \t\t\t\treg = <0x020f0000 0x4000>;\n",
"-- \n",
"2.1.4"
]
-b685b2d9d5099be8e0ffd066b9f8978ae0f0490f82b497e913b16d838819c1d9
+2ca16ac7b09dd0567dff8d020073f8280693de3566389bd21838970c93906e8b
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.