diff for duplicates of <1452619291-13625-14-git-send-email-LW@KARO-electronics.de>
diff --git a/a/1.txt b/N1/1.txt
index 4b0e76e..b49b57a 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -48,4 +48,10 @@ index 0123480..710e6ca 100644
compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>;
--
-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 7bc6ad4..1894c6b 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -119,7 +119,13 @@
" \t\t\tcompatible = \"fsl,aips-bus\", \"simple-bus\";\n",
" \t\t\t#address-cells = <1>;\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"
]
-96b9cd0e9a33f8a84ed3c941c55e90b308ea62296992c063452aaa70a5b7240e
+cabf1fbd2bc80d3a0997e7dcb58cca07bc43ce12a9d1cf120af8bc735eca94e6
diff --git a/a/1.txt b/N2/1.txt
index 4b0e76e..b96c048 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 | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
@@ -11,7 +11,7 @@ index 0123480..710e6ca 100644
reg = <0x00900000 0x20000>;
};
-+ dma_apbh: dma-apbh@01804000 {
++ dma_apbh: dma-apbh at 01804000 {
+ compatible = "fsl,imx6q-dma-apbh", "fsl,imx28-dma-apbh";
+ reg = <0x01804000 0x2000>;
+ interrupts = <0 13 IRQ_TYPE_LEVEL_HIGH>,
@@ -24,7 +24,7 @@ index 0123480..710e6ca 100644
+ clocks = <&clks IMX6UL_CLK_APBHDMA>;
+ };
+
-+ gpmi: gpmi-nand@01806000 {
++ gpmi: gpmi-nand at 01806000 {
+ compatible = "fsl,imx6q-gpmi-nand";
+ #address-cells = <1>;
+ #size-cells = <1>;
@@ -44,7 +44,7 @@ index 0123480..710e6ca 100644
+ status = "disabled";
+ };
+
- aips1: aips-bus@02000000 {
+ aips1: aips-bus at 02000000 {
compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>;
--
diff --git a/a/content_digest b/N2/content_digest
index 7bc6ad4..4199159 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -38,7 +38,7 @@
"ref\0001452619291-13625-13-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 13/14] ARM: dts: imx6ul: add gpmi support\0"
@@ -47,20 +47,7 @@
"Date\0Tue, 12 Jan 2016 18:21:30 +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"
@@ -69,7 +56,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 | 33 +++++++++++++++++++++++++++++++++\n",
" 1 file changed, 33 insertions(+)\n",
@@ -82,7 +69,7 @@
" \t\t\treg = <0x00900000 0x20000>;\n",
" \t\t};\n",
" \n",
- "+\t\tdma_apbh: dma-apbh\@01804000 {\n",
+ "+\t\tdma_apbh: dma-apbh at 01804000 {\n",
"+\t\t\tcompatible = \"fsl,imx6q-dma-apbh\", \"fsl,imx28-dma-apbh\";\n",
"+\t\t\treg = <0x01804000 0x2000>;\n",
"+\t\t\tinterrupts = <0 13 IRQ_TYPE_LEVEL_HIGH>,\n",
@@ -95,7 +82,7 @@
"+\t\t\tclocks = <&clks IMX6UL_CLK_APBHDMA>;\n",
"+\t\t};\n",
"+\n",
- "+\t\tgpmi: gpmi-nand\@01806000 {\n",
+ "+\t\tgpmi: gpmi-nand at 01806000 {\n",
"+\t\t\tcompatible = \"fsl,imx6q-gpmi-nand\";\n",
"+\t\t\t#address-cells = <1>;\n",
"+\t\t\t#size-cells = <1>;\n",
@@ -115,11 +102,11 @@
"+\t\t\tstatus = \"disabled\";\n",
"+\t\t};\n",
"+\n",
- " \t\taips1: aips-bus\@02000000 {\n",
+ " \t\taips1: aips-bus at 02000000 {\n",
" \t\t\tcompatible = \"fsl,aips-bus\", \"simple-bus\";\n",
" \t\t\t#address-cells = <1>;\n",
"-- \n",
"2.1.4"
]
-96b9cd0e9a33f8a84ed3c941c55e90b308ea62296992c063452aaa70a5b7240e
+683edae115f40256b26f53f430a3a577f30e534deb188ea461fc671e110152cf
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.