diff for duplicates of <1453284549-16363-7-git-send-email-LW@KARO-electronics.de>
diff --git a/a/1.txt b/N1/1.txt
index cc90ff1..d19ee5b 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -46,4 +46,10 @@ index 3aba0bb..863777e 100644
};
--
-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 f692c18..c26e46f 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -89,7 +89,13 @@
" \t\t};\n",
" \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"
]
-0757f76904a574179be0ba8bb712cbb846d887a0f2c2641f38072c4fb807b444
+620109cb078b9e0a9d3016165f065e391feb138bcff169f8e3bbef2f27490686
diff --git a/a/1.txt b/N2/1.txt
index cc90ff1..5b713dc 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -4,7 +4,7 @@ also set up the pin configuration. This is in sync with a recent change
(commit e2675266b39b "ARM: dts: imx6qdl: disable PWMs by default")
to other i.MX SoCs.
-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 | 4 ++++
1 file changed, 4 insertions(+)
@@ -20,7 +20,7 @@ index 3aba0bb..863777e 100644
+ status = "disabled";
};
- pwm6: pwm@020f4000 {
+ pwm6: pwm at 020f4000 {
@@ -522,6 +523,7 @@
<&clks IMX6UL_CLK_PWM6>;
clock-names = "ipg", "per";
@@ -28,7 +28,7 @@ index 3aba0bb..863777e 100644
+ status = "disabled";
};
- pwm7: pwm@020f8000 {
+ pwm7: pwm at 020f8000 {
@@ -532,6 +534,7 @@
<&clks IMX6UL_CLK_PWM7>;
clock-names = "ipg", "per";
@@ -36,7 +36,7 @@ index 3aba0bb..863777e 100644
+ status = "disabled";
};
- pwm8: pwm@020fc000 {
+ pwm8: pwm at 020fc000 {
@@ -542,6 +545,7 @@
<&clks IMX6UL_CLK_PWM8>;
clock-names = "ipg", "per";
diff --git a/a/content_digest b/N2/content_digest
index f692c18..5ef0038 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -5,7 +5,7 @@
"ref\0001453284549-16363-1-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[PATCHv2 06/16] ARM: dts: imx6ul: disable PWMs by default\0"
@@ -14,25 +14,7 @@
"Date\0Wed, 20 Jan 2016 11:08:59 +0100\0"
]
[
- "To\0Anson Huang <b20788\@freescale.com>",
- " Bai Ping <b51503\@freescale.com>",
- " Frank Li <Frank.Li\@freescale.com>",
- " Fugang Duan <B38611\@freescale.com>",
- " Ian Campbell <ijc+devicetree\@hellion.org.uk>",
- " Kumar Gala <galak\@codeaurora.org>",
- " Lothar Wa\303\237mann <LW\@karo-electronics.de>",
- " Mark Rutland <mark.rutland\@arm.com>",
- " Michael Turquette <mturquette\@baylibre.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>",
- " Stephen Boyd <sboyd\@codeaurora.org>",
- " devicetree\@vger.kernel.org",
- " linux-arm-kernel\@lists.infradead.org",
- " linux-clk\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -47,7 +29,7 @@
"(commit e2675266b39b \"ARM: dts: imx6qdl: disable PWMs by default\")\n",
"to other i.MX SoCs.\n",
"\n",
- "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 | 4 ++++\n",
" 1 file changed, 4 insertions(+)\n",
@@ -63,7 +45,7 @@
"+\t\t\t\tstatus = \"disabled\";\n",
" \t\t\t};\n",
" \n",
- " \t\t\tpwm6: pwm\@020f4000 {\n",
+ " \t\t\tpwm6: pwm at 020f4000 {\n",
"\@\@ -522,6 +523,7 \@\@\n",
" \t\t\t\t\t <&clks IMX6UL_CLK_PWM6>;\n",
" \t\t\t\tclock-names = \"ipg\", \"per\";\n",
@@ -71,7 +53,7 @@
"+\t\t\t\tstatus = \"disabled\";\n",
" \t\t\t};\n",
" \n",
- " \t\t\tpwm7: pwm\@020f8000 {\n",
+ " \t\t\tpwm7: pwm at 020f8000 {\n",
"\@\@ -532,6 +534,7 \@\@\n",
" \t\t\t\t\t <&clks IMX6UL_CLK_PWM7>;\n",
" \t\t\t\tclock-names = \"ipg\", \"per\";\n",
@@ -79,7 +61,7 @@
"+\t\t\t\tstatus = \"disabled\";\n",
" \t\t\t};\n",
" \n",
- " \t\t\tpwm8: pwm\@020fc000 {\n",
+ " \t\t\tpwm8: pwm at 020fc000 {\n",
"\@\@ -542,6 +545,7 \@\@\n",
" \t\t\t\t\t <&clks IMX6UL_CLK_PWM8>;\n",
" \t\t\t\tclock-names = \"ipg\", \"per\";\n",
@@ -92,4 +74,4 @@
"2.1.4"
]
-0757f76904a574179be0ba8bb712cbb846d887a0f2c2641f38072c4fb807b444
+28343dca4def178f3d0fc8f45f623dcf0422cf47b4094e1ba97cb0558e2d0566
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.