diff for duplicates of <1453284549-16363-16-git-send-email-LW@KARO-electronics.de>
diff --git a/a/1.txt b/N1/1.txt
index 4472ef7..af8efb3 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,6 +1,6 @@
This patch adds the device node for the i.MX6UL keypad controller.
-Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
+Signed-off-by: Lothar Waßmann <LW-bxm8fMRDkQLDiMYJYoSAnRvVK+yQ3ZXh@public.gmane.org>
---
arch/arm/boot/dts/imx6ul.dtsi | 8 ++++++++
1 file changed, 8 insertions(+)
@@ -25,4 +25,9 @@ index 8499b3d..7177899 100644
compatible = "fsl,imx6ul-wdt", "fsl,imx21-wdt";
reg = <0x020bc000 0x4000>;
--
-2.1.4
\ No newline at end of file
+2.1.4
+
+--
+To unsubscribe from this list: send the line "unsubscribe devicetree" in
+the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
+More majordomo info at http://vger.kernel.org/majordomo-info.html
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 3c8a6d0..62abcb9 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -5,7 +5,10 @@
"ref\0001453284549-16363-1-git-send-email-LW\@KARO-electronics.de\0"
]
[
- "From\0Lothar Wa\303\237mann <LW\@karo-electronics.de>\0"
+ "ref\0001453284549-16363-1-git-send-email-LW-bxm8fMRDkQLDiMYJYoSAnRvVK+yQ3ZXh\@public.gmane.org\0"
+]
+[
+ "From\0Lothar Wa\303\237mann <LW-bxm8fMRDkQLDiMYJYoSAnRvVK+yQ3ZXh\@public.gmane.org>\0"
]
[
"Subject\0[PATCHv2 15/16] ARM: dts: imx6ul: add kpp support\0"
@@ -14,25 +17,25 @@
"Date\0Wed, 20 Jan 2016 11:09:08 +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\0Anson Huang <b20788-KZfg59tc24xl57MIdRCFDg\@public.gmane.org>",
+ " Bai Ping <b51503-KZfg59tc24xl57MIdRCFDg\@public.gmane.org>",
+ " Frank Li <Frank.Li-KZfg59tc24xl57MIdRCFDg\@public.gmane.org>",
+ " Fugang Duan <B38611-KZfg59tc24xl57MIdRCFDg\@public.gmane.org>",
+ " Ian Campbell <ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg\@public.gmane.org>",
+ " Kumar Gala <galak-sgV2jX0FEOL9JmXXK+q4OQ\@public.gmane.org>",
+ " Lothar Wa\303\237mann <LW-bxm8fMRDkQLDiMYJYoSAnRvVK+yQ3ZXh\@public.gmane.org>",
+ " Mark Rutland <mark.rutland-5wv7dgnIgG8\@public.gmane.org>",
+ " Michael Turquette <mturquette-rdvid1DuHRBWk0Htik3J/w\@public.gmane.org>",
+ " Pawel Moll <pawel.moll-5wv7dgnIgG8\@public.gmane.org>",
+ " Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A\@public.gmane.org>",
+ " Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ\@public.gmane.org>",
+ " Sascha Hauer <kernel-bIcnvbaLZ9MEGnE8C9+IrQ\@public.gmane.org>",
+ " Shawn Guo <shawnguo-DgEjT+Ai2ygdnm+yROfE0A\@public.gmane.org>",
+ " Stephen Boyd <sboyd-sgV2jX0FEOL9JmXXK+q4OQ\@public.gmane.org>",
+ " devicetree-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+ " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r\@public.gmane.org",
+ " linux-clk-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+ " linux-kernel-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org\0"
]
[
"\0000:1\0"
@@ -43,7 +46,7 @@
[
"This patch adds the device node for the i.MX6UL keypad controller.\n",
"\n",
- "Signed-off-by: Lothar Wa\303\237mann <LW\@KARO-electronics.de>\n",
+ "Signed-off-by: Lothar Wa\303\237mann <LW-bxm8fMRDkQLDiMYJYoSAnRvVK+yQ3ZXh\@public.gmane.org>\n",
"---\n",
" arch/arm/boot/dts/imx6ul.dtsi | 8 ++++++++\n",
" 1 file changed, 8 insertions(+)\n",
@@ -68,7 +71,12 @@
" \t\t\t\tcompatible = \"fsl,imx6ul-wdt\", \"fsl,imx21-wdt\";\n",
" \t\t\t\treg = <0x020bc000 0x4000>;\n",
"-- \n",
- "2.1.4"
+ "2.1.4\n",
+ "\n",
+ "--\n",
+ "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n",
+ "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org\n",
+ "More majordomo info at http://vger.kernel.org/majordomo-info.html"
]
-b7f26cc68c2b1b71d6e9a9bec6c0a01c6d8af8c12dbf1551674c5def8c189ac6
+c18dee77586315cce90f16427f0cb3c49e511e5cc39e47b189ef91d060815ce4
diff --git a/a/1.txt b/N2/1.txt
index 4472ef7..73262d0 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -1,6 +1,6 @@
This patch adds the device node for the i.MX6UL keypad controller.
-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 | 8 ++++++++
1 file changed, 8 insertions(+)
@@ -13,7 +13,7 @@ index 8499b3d..7177899 100644
status = "disabled";
};
-+ kpp: kpp@020b8000 {
++ kpp: kpp at 020b8000 {
+ compatible = "fsl,imx6ul-kpp", "fsl,imx6q-kpp", "fsl,imx21-kpp";
+ reg = <0x020b8000 0x4000>;
+ interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
@@ -21,7 +21,7 @@ index 8499b3d..7177899 100644
+ status = "disabled";
+ };
+
- wdog1: wdog@020bc000 {
+ wdog1: wdog at 020bc000 {
compatible = "fsl,imx6ul-wdt", "fsl,imx21-wdt";
reg = <0x020bc000 0x4000>;
--
diff --git a/a/content_digest b/N2/content_digest
index 3c8a6d0..4441542 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 15/16] ARM: dts: imx6ul: add kpp support\0"
@@ -14,25 +14,7 @@
"Date\0Wed, 20 Jan 2016 11:09:08 +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"
@@ -43,7 +25,7 @@
[
"This patch adds the device node for the i.MX6UL keypad controller.\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 | 8 ++++++++\n",
" 1 file changed, 8 insertions(+)\n",
@@ -56,7 +38,7 @@
" \t\t\t\tstatus = \"disabled\";\n",
" \t\t\t};\n",
" \n",
- "+\t\t\tkpp: kpp\@020b8000 {\n",
+ "+\t\t\tkpp: kpp at 020b8000 {\n",
"+\t\t\t\tcompatible = \"fsl,imx6ul-kpp\", \"fsl,imx6q-kpp\", \"fsl,imx21-kpp\";\n",
"+\t\t\t\treg = <0x020b8000 0x4000>;\n",
"+\t\t\t\tinterrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;\n",
@@ -64,11 +46,11 @@
"+\t\t\t\tstatus = \"disabled\";\n",
"+\t\t\t};\n",
"+\n",
- " \t\t\twdog1: wdog\@020bc000 {\n",
+ " \t\t\twdog1: wdog at 020bc000 {\n",
" \t\t\t\tcompatible = \"fsl,imx6ul-wdt\", \"fsl,imx21-wdt\";\n",
" \t\t\t\treg = <0x020bc000 0x4000>;\n",
"-- \n",
"2.1.4"
]
-b7f26cc68c2b1b71d6e9a9bec6c0a01c6d8af8c12dbf1551674c5def8c189ac6
+81212ed0a1e3fc94a8872370b97f59e7e7ce8c3183f2eb2e6d077caf6552144d
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.