diff for duplicates of <1363377988-4966-6-git-send-email-maxime.ripard@free-electrons.com>
diff --git a/a/1.txt b/N1/1.txt
index 9059ca3..3414b9f 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -2,7 +2,7 @@ The Allwinner A10 SoC has 8 available UARTs, which is 6 more than on the
A13, so add the missing UARTs to the sun4i-a10 dtsi.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
-Acked-by: Emilio López <emilio@elopez.com.ar>
+Acked-by: Emilio L?pez <emilio@elopez.com.ar>
---
arch/arm/boot/dts/sun4i-a10.dtsi | 51 ++++++++++++++++++++++++++++++++++++++
1 file changed, 51 insertions(+)
@@ -16,7 +16,7 @@ index 703e7cb..0142ca0 100644
status = "disabled";
};
+
-+ uart2: uart@01c28800 {
++ uart2: uart at 01c28800 {
+ compatible = "snps,dw-apb-uart";
+ reg = <0x01c28800 0x400>;
+ interrupts = <3>;
@@ -27,7 +27,7 @@ index 703e7cb..0142ca0 100644
+ };
+
+
-+ uart4: uart@01c29000 {
++ uart4: uart at 01c29000 {
+ compatible = "snps,dw-apb-uart";
+ reg = <0x01c29000 0x400>;
+ interrupts = <17>;
@@ -37,7 +37,7 @@ index 703e7cb..0142ca0 100644
+ status = "disabled";
+ };
+
-+ uart5: uart@01c29400 {
++ uart5: uart at 01c29400 {
+ compatible = "snps,dw-apb-uart";
+ reg = <0x01c29400 0x400>;
+ interrupts = <18>;
@@ -47,7 +47,7 @@ index 703e7cb..0142ca0 100644
+ status = "disabled";
+ };
+
-+ uart6: uart@01c29800 {
++ uart6: uart at 01c29800 {
+ compatible = "snps,dw-apb-uart";
+ reg = <0x01c29800 0x400>;
+ interrupts = <19>;
@@ -57,7 +57,7 @@ index 703e7cb..0142ca0 100644
+ status = "disabled";
+ };
+
-+ uart7: uart@01c29c00 {
++ uart7: uart at 01c29c00 {
+ compatible = "snps,dw-apb-uart";
+ reg = <0x01c29c00 0x400>;
+ interrupts = <20>;
diff --git a/a/content_digest b/N1/content_digest
index 4b1df44..a0166a5 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
"ref\0001363377988-4966-1-git-send-email-maxime.ripard\@free-electrons.com\0"
]
[
- "From\0Maxime Ripard <maxime.ripard\@free-electrons.com>\0"
+ "From\0maxime.ripard\@free-electrons.com (Maxime Ripard)\0"
]
[
"Subject\0[PATCH 5/6] ARM: sunxi: dt: Add A10 UARTs to the dtsi.\0"
@@ -13,13 +13,6 @@
[
"To\0linux-arm-kernel\@lists.infradead.org\0"
]
-[
- "Cc\0kevin\@allwinnertech.com",
- " sunny\@allwinnertech.com",
- " shuge\@allwinnertech.com",
- " Russell King <linux\@arm.linux.org.uk>",
- " linux-kernel\@vger.kernel.org\0"
-]
[
"\0000:1\0"
]
@@ -31,7 +24,7 @@
"A13, so add the missing UARTs to the sun4i-a10 dtsi.\n",
"\n",
"Signed-off-by: Maxime Ripard <maxime.ripard\@free-electrons.com>\n",
- "Acked-by: Emilio L\303\263pez <emilio\@elopez.com.ar>\n",
+ "Acked-by: Emilio L?pez <emilio\@elopez.com.ar>\n",
"---\n",
" arch/arm/boot/dts/sun4i-a10.dtsi | 51 ++++++++++++++++++++++++++++++++++++++\n",
" 1 file changed, 51 insertions(+)\n",
@@ -45,7 +38,7 @@
" \t\t\tstatus = \"disabled\";\n",
" \t\t};\n",
"+\n",
- "+\t\tuart2: uart\@01c28800 {\n",
+ "+\t\tuart2: uart at 01c28800 {\n",
"+\t\t\tcompatible = \"snps,dw-apb-uart\";\n",
"+\t\t\treg = <0x01c28800 0x400>;\n",
"+\t\t\tinterrupts = <3>;\n",
@@ -56,7 +49,7 @@
"+\t\t};\n",
"+\n",
"+\n",
- "+\t\tuart4: uart\@01c29000 {\n",
+ "+\t\tuart4: uart at 01c29000 {\n",
"+\t\t\tcompatible = \"snps,dw-apb-uart\";\n",
"+\t\t\treg = <0x01c29000 0x400>;\n",
"+\t\t\tinterrupts = <17>;\n",
@@ -66,7 +59,7 @@
"+\t\t\tstatus = \"disabled\";\n",
"+\t\t};\n",
"+\n",
- "+\t\tuart5: uart\@01c29400 {\n",
+ "+\t\tuart5: uart at 01c29400 {\n",
"+\t\t\tcompatible = \"snps,dw-apb-uart\";\n",
"+\t\t\treg = <0x01c29400 0x400>;\n",
"+\t\t\tinterrupts = <18>;\n",
@@ -76,7 +69,7 @@
"+\t\t\tstatus = \"disabled\";\n",
"+\t\t};\n",
"+\n",
- "+\t\tuart6: uart\@01c29800 {\n",
+ "+\t\tuart6: uart at 01c29800 {\n",
"+\t\t\tcompatible = \"snps,dw-apb-uart\";\n",
"+\t\t\treg = <0x01c29800 0x400>;\n",
"+\t\t\tinterrupts = <19>;\n",
@@ -86,7 +79,7 @@
"+\t\t\tstatus = \"disabled\";\n",
"+\t\t};\n",
"+\n",
- "+\t\tuart7: uart\@01c29c00 {\n",
+ "+\t\tuart7: uart at 01c29c00 {\n",
"+\t\t\tcompatible = \"snps,dw-apb-uart\";\n",
"+\t\t\treg = <0x01c29c00 0x400>;\n",
"+\t\t\tinterrupts = <20>;\n",
@@ -101,4 +94,4 @@
"1.7.10.4"
]
-913320430e3cc126ea96cc68b24134479fa3d6f6d0483b3baffe9af82650954d
+4848529e0005e7f180c5a20b9839a0b312b1f30c0efe4221b390fe3446fdeeb1
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.