diff for duplicates of <1363377988-4966-7-git-send-email-maxime.ripard@free-electrons.com>
diff --git a/a/1.txt b/N1/1.txt
index 60ca749..a27488c 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -2,7 +2,7 @@ We previously relied on the bootloader to do the muxing of the UART for
the Hackberry. Don't rely on it anymore and use pinctrl.
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-hackberry.dts | 2 ++
1 file changed, 2 insertions(+)
@@ -14,7 +14,7 @@ index f84549a..97703fe 100644
@@ -24,6 +24,8 @@
soc {
- uart0: uart@01c28000 {
+ uart0: uart at 01c28000 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart0_pins_a>;
status = "okay";
diff --git a/a/content_digest b/N1/content_digest
index 1ed5f89..1168b33 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 6/6] ARM: sunxi: hackberry: Add UART muxing\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 @@
"the Hackberry. Don't rely on it anymore and use pinctrl.\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-hackberry.dts | 2 ++\n",
" 1 file changed, 2 insertions(+)\n",
@@ -43,7 +36,7 @@
"\@\@ -24,6 +24,8 \@\@\n",
" \n",
" \tsoc {\n",
- " \t\tuart0: uart\@01c28000 {\n",
+ " \t\tuart0: uart at 01c28000 {\n",
"+\t\t\tpinctrl-names = \"default\";\n",
"+\t\t\tpinctrl-0 = <&uart0_pins_a>;\n",
" \t\t\tstatus = \"okay\";\n",
@@ -53,4 +46,4 @@
"1.7.10.4"
]
-6598547e0851ffe140383217986789b5a46d13d1814aed83c92bce41561fca98
+b92933c87bf5254308f976a48ced6cc551a209ba069a651806ae0d6f9c9c97fe
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.