diff for duplicates of <1452619291-13625-3-git-send-email-LW@KARO-electronics.de>
diff --git a/a/1.txt b/N1/1.txt
index fc84a75..a16ebee 100644
--- a/a/1.txt
+++ b/N1/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 | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
@@ -11,7 +11,7 @@ index 99b6465..7e27d76 100644
};
};
-+ tsc: tsc@02040000 {
++ tsc: tsc at 02040000 {
+ compatible = "fsl,imx6ul-tsc";
+ reg = <0x02040000 0x4000>, <0x0219c000 0x4000>;
+ interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
@@ -22,14 +22,14 @@ index 99b6465..7e27d76 100644
+ status = "disabled";
+ };
+
- gpt1: gpt@02098000 {
+ gpt1: gpt at 02098000 {
compatible = "fsl,imx6ul-gpt", "fsl,imx6sx-gpt";
reg = <0x02098000 0x4000>;
@@ -590,17 +601,6 @@
status = "disabled";
};
-- tsc: tsc@02040000 {
+- tsc: tsc at 02040000 {
- compatible = "fsl,imx6ul-tsc";
- reg = <0x02040000 0x4000>, <0x0219c000 0x4000>;
- interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
@@ -40,7 +40,7 @@ index 99b6465..7e27d76 100644
- status = "disabled";
- };
-
- usdhc1: usdhc@02190000 {
+ usdhc1: usdhc at 02190000 {
compatible = "fsl,imx6ul-usdhc", "fsl,imx6sx-usdhc";
reg = <0x02190000 0x4000>;
--
diff --git a/a/content_digest b/N1/content_digest
index fb88f9c..b70311f 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -5,7 +5,7 @@
"ref\0001452619291-13625-2-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 02/14] ARM: dts: imx6ul: move tsc node to appropriate place in the DTB\0"
@@ -14,20 +14,7 @@
"Date\0Tue, 12 Jan 2016 18:21:19 +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"
@@ -36,7 +23,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 | 22 +++++++++++-----------\n",
" 1 file changed, 11 insertions(+), 11 deletions(-)\n",
@@ -49,7 +36,7 @@
" \t\t\t\t};\n",
" \t\t\t};\n",
" \n",
- "+\t\t\ttsc: tsc\@02040000 {\n",
+ "+\t\t\ttsc: tsc at 02040000 {\n",
"+\t\t\t\tcompatible = \"fsl,imx6ul-tsc\";\n",
"+\t\t\t\treg = <0x02040000 0x4000>, <0x0219c000 0x4000>;\n",
"+\t\t\t\tinterrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,\n",
@@ -60,14 +47,14 @@
"+\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",
"\@\@ -590,17 +601,6 \@\@\n",
" \t\t\t\tstatus = \"disabled\";\n",
" \t\t\t};\n",
" \n",
- "-\t\t\ttsc: tsc\@02040000 {\n",
+ "-\t\t\ttsc: tsc at 02040000 {\n",
"-\t\t\t\tcompatible = \"fsl,imx6ul-tsc\";\n",
"-\t\t\t\treg = <0x02040000 0x4000>, <0x0219c000 0x4000>;\n",
"-\t\t\t\tinterrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,\n",
@@ -78,11 +65,11 @@
"-\t\t\t\tstatus = \"disabled\";\n",
"-\t\t\t};\n",
"-\n",
- " \t\t\tusdhc1: usdhc\@02190000 {\n",
+ " \t\t\tusdhc1: usdhc at 02190000 {\n",
" \t\t\t\tcompatible = \"fsl,imx6ul-usdhc\", \"fsl,imx6sx-usdhc\";\n",
" \t\t\t\treg = <0x02190000 0x4000>;\n",
"-- \n",
"2.1.4"
]
-3aa12590ea519608e77445532589106036e29ab256de6bedb875d45fad11fb26
+a4a3c8cc2b064cbfb8e733dbb50bab50d20e12f7817a7bf5c4d0a39df6ef7199
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.