diff for duplicates of <1452619291-13625-13-git-send-email-LW@KARO-electronics.de>
diff --git a/a/1.txt b/N1/1.txt
index 426bd3a..254f06e 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 | 11 +++++++++++
1 file changed, 11 insertions(+)
@@ -11,7 +11,7 @@ index 3d43321f..0123480 100644
reg = <0x021b0000 0x4000>;
};
-+ lcdif: lcdif@021c8000 {
++ lcdif: lcdif at 021c8000 {
+ compatible = "fsl,imx6ul-lcdif", "fsl,imx28-lcdif";
+ reg = <0x021c8000 0x4000>;
+ interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
@@ -22,7 +22,7 @@ index 3d43321f..0123480 100644
+ status = "disabled";
+ };
+
- qspi: qspi@021e0000 {
+ qspi: qspi at 021e0000 {
#address-cells = <1>;
#size-cells = <0>;
--
diff --git a/a/content_digest b/N1/content_digest
index d415f5a..3797a3d 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -35,7 +35,7 @@
"ref\0001452619291-13625-12-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 12/14] ARM: dts: imx6ul: add lcdif support\0"
@@ -44,20 +44,7 @@
"Date\0Tue, 12 Jan 2016 18:21:29 +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"
@@ -66,7 +53,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",
@@ -79,7 +66,7 @@
" \t\t\t\treg = <0x021b0000 0x4000>;\n",
" \t\t\t};\n",
" \n",
- "+\t\t\tlcdif: lcdif\@021c8000 {\n",
+ "+\t\t\tlcdif: lcdif at 021c8000 {\n",
"+\t\t\t\tcompatible = \"fsl,imx6ul-lcdif\", \"fsl,imx28-lcdif\";\n",
"+\t\t\t\treg = <0x021c8000 0x4000>;\n",
"+\t\t\t\tinterrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;\n",
@@ -90,11 +77,11 @@
"+\t\t\t\tstatus = \"disabled\";\n",
"+\t\t\t};\n",
"+\n",
- " \t\t\tqspi: qspi\@021e0000 {\n",
+ " \t\t\tqspi: qspi at 021e0000 {\n",
" \t\t\t\t#address-cells = <1>;\n",
" \t\t\t\t#size-cells = <0>;\n",
"-- \n",
"2.1.4"
]
-bf93f0b33a78b813e13a07cfa63518e7a934a5d8bb3877505f24cb6b4212cc92
+de45350c4d24cbbbd8a56412286ae502f221a048748d6f5ca57a3ae76f2c76eb
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.