diff for duplicates of <1452619291-13625-8-git-send-email-LW@KARO-electronics.de>
diff --git a/a/1.txt b/N1/1.txt
index 7de8838..19271fc 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -59,4 +59,10 @@ index 863777e..40ea5f0 100644
compatible = "fsl,imx6ul-gpt", "fsl,imx6sx-gpt";
reg = <0x02098000 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 68da42a..ae8e527 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -112,7 +112,13 @@
" \t\t\t\tcompatible = \"fsl,imx6ul-gpt\", \"fsl,imx6sx-gpt\";\n",
" \t\t\t\treg = <0x02098000 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"
]
-7fa0188d775bcc61b624584ceab7636a0422312299b28f0a44d2d9dc4881ff0a
+0ab9c0b975bf0e51fdf978c5fa5d72ff076dc7f8423f31d8d068b1fcd780fde6
diff --git a/a/1.txt b/N2/1.txt
index 7de8838..86f175a 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 | 44 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 44 insertions(+)
@@ -11,7 +11,7 @@ index 863777e..40ea5f0 100644
status = "disabled";
};
-+ pwm1: pwm@02080000 {
++ pwm1: pwm at 02080000 {
+ compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";
+ reg = <0x02080000 0x4000>;
+ interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>;
@@ -22,7 +22,7 @@ index 863777e..40ea5f0 100644
+ status = "disabled";
+ };
+
-+ pwm2: pwm@02084000 {
++ pwm2: pwm at 02084000 {
+ compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";
+ reg = <0x02084000 0x4000>;
+ interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>;
@@ -33,7 +33,7 @@ index 863777e..40ea5f0 100644
+ status = "disabled";
+ };
+
-+ pwm3: pwm@02088000 {
++ pwm3: pwm at 02088000 {
+ compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";
+ reg = <0x02088000 0x4000>;
+ interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;
@@ -44,7 +44,7 @@ index 863777e..40ea5f0 100644
+ status = "disabled";
+ };
+
-+ pwm4: pwm@0208c000 {
++ pwm4: pwm at 0208c000 {
+ compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";
+ reg = <0x0208c000 0x4000>;
+ interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
@@ -55,7 +55,7 @@ index 863777e..40ea5f0 100644
+ status = "disabled";
+ };
+
- gpt1: gpt@02098000 {
+ gpt1: gpt at 02098000 {
compatible = "fsl,imx6ul-gpt", "fsl,imx6sx-gpt";
reg = <0x02098000 0x4000>;
--
diff --git a/a/content_digest b/N2/content_digest
index 68da42a..a1a6bf2 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -20,7 +20,7 @@
"ref\0001452619291-13625-7-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 07/14] ARM: dts: imx6ul: add pwm[1-4] nodes\0"
@@ -29,20 +29,7 @@
"Date\0Tue, 12 Jan 2016 18:21:24 +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"
@@ -51,7 +38,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 | 44 +++++++++++++++++++++++++++++++++++++++++++\n",
" 1 file changed, 44 insertions(+)\n",
@@ -64,7 +51,7 @@
" \t\t\t\tstatus = \"disabled\";\n",
" \t\t\t};\n",
" \n",
- "+\t\t\tpwm1: pwm\@02080000 {\n",
+ "+\t\t\tpwm1: pwm at 02080000 {\n",
"+\t\t\t\tcompatible = \"fsl,imx6ul-pwm\", \"fsl,imx27-pwm\";\n",
"+\t\t\t\treg = <0x02080000 0x4000>;\n",
"+\t\t\t\tinterrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>;\n",
@@ -75,7 +62,7 @@
"+\t\t\t\tstatus = \"disabled\";\n",
"+\t\t\t};\n",
"+\n",
- "+\t\t\tpwm2: pwm\@02084000 {\n",
+ "+\t\t\tpwm2: pwm at 02084000 {\n",
"+\t\t\t\tcompatible = \"fsl,imx6ul-pwm\", \"fsl,imx27-pwm\";\n",
"+\t\t\t\treg = <0x02084000 0x4000>;\n",
"+\t\t\t\tinterrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>;\n",
@@ -86,7 +73,7 @@
"+\t\t\t\tstatus = \"disabled\";\n",
"+\t\t\t};\n",
"+\n",
- "+\t\t\tpwm3: pwm\@02088000 {\n",
+ "+\t\t\tpwm3: pwm at 02088000 {\n",
"+\t\t\t\tcompatible = \"fsl,imx6ul-pwm\", \"fsl,imx27-pwm\";\n",
"+\t\t\t\treg = <0x02088000 0x4000>;\n",
"+\t\t\t\tinterrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;\n",
@@ -97,7 +84,7 @@
"+\t\t\t\tstatus = \"disabled\";\n",
"+\t\t\t};\n",
"+\n",
- "+\t\t\tpwm4: pwm\@0208c000 {\n",
+ "+\t\t\tpwm4: pwm at 0208c000 {\n",
"+\t\t\t\tcompatible = \"fsl,imx6ul-pwm\", \"fsl,imx27-pwm\";\n",
"+\t\t\t\treg = <0x0208c000 0x4000>;\n",
"+\t\t\t\tinterrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;\n",
@@ -108,11 +95,11 @@
"+\t\t\t\tstatus = \"disabled\";\n",
"+\t\t\t};\n",
"+\n",
- " \t\t\tgpt1: gpt\@02098000 {\n",
+ " \t\t\tgpt1: gpt at 02098000 {\n",
" \t\t\t\tcompatible = \"fsl,imx6ul-gpt\", \"fsl,imx6sx-gpt\";\n",
" \t\t\t\treg = <0x02098000 0x4000>;\n",
"-- \n",
"2.1.4"
]
-7fa0188d775bcc61b624584ceab7636a0422312299b28f0a44d2d9dc4881ff0a
+926dafc9c6580503f34c58fc43d617afed2c243783eff31495ad6bc40bb080c8
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.