diff for duplicates of <1398181105-19714-6-git-send-email-antoine.tenart@free-electrons.com>
diff --git a/a/1.txt b/N1/1.txt
index 022aa69..52b75f9 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,7 +1,7 @@
The BG2 has an AHCI SATA controller. Add the corresponding node
in its device tree.
-Signed-off-by: Antoine Ténart <antoine.tenart@free-electrons.com>
+Signed-off-by: Antoine T?nart <antoine.tenart@free-electrons.com>
---
arch/arm/boot/dts/berlin2.dtsi | 7 +++++++
1 file changed, 7 insertions(+)
@@ -14,14 +14,14 @@ index 56a1af2f1052..3e98d9fa9ec7 100644
};
};
-+ ahci: sata@e90000 {
++ ahci: sata at e90000 {
+ compatible = "marvell,berlin-ahci";
+ reg = <0xe90000 0x10000>;
+ interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disable";
+ };
+
- apb@fc0000 {
+ apb at fc0000 {
compatible = "simple-bus";
#address-cells = <1>;
--
diff --git a/a/content_digest b/N1/content_digest
index c18c67f..6e36632 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
"ref\0001398181105-19714-1-git-send-email-antoine.tenart\@free-electrons.com\0"
]
[
- "From\0Antoine T\303\251nart <antoine.tenart\@free-electrons.com>\0"
+ "From\0antoine.tenart\@free-electrons.com (Antoine T\303\251nart)\0"
]
[
"Subject\0[PATCH 5/6] ARM: berlin: add the AHCI node for the BG2\0"
@@ -11,18 +11,7 @@
"Date\0Tue, 22 Apr 2014 17:38:24 +0200\0"
]
[
- "To\0sebastian.hesselbarth\@gmail.com",
- " tj\@kernel.org\0"
-]
-[
- "Cc\0Antoine T\303\251nart <antoine.tenart\@free-electrons.com>",
- " alexandre.belloni\@free-electrons.com",
- " zmxu\@marvell.com",
- " jszhang\@marvell.com",
- " linux-arm-kernel\@lists.infradead.org",
- " devicetree\@vger.kernel.org",
- " linux-ide\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -34,7 +23,7 @@
"The BG2 has an AHCI SATA controller. Add the corresponding node\n",
"in its device tree.\n",
"\n",
- "Signed-off-by: Antoine T\303\251nart <antoine.tenart\@free-electrons.com>\n",
+ "Signed-off-by: Antoine T?nart <antoine.tenart\@free-electrons.com>\n",
"---\n",
" arch/arm/boot/dts/berlin2.dtsi | 7 +++++++\n",
" 1 file changed, 7 insertions(+)\n",
@@ -47,18 +36,18 @@
" \t\t\t};\n",
" \t\t};\n",
" \n",
- "+\t\tahci: sata\@e90000 {\n",
+ "+\t\tahci: sata at e90000 {\n",
"+\t\t\tcompatible = \"marvell,berlin-ahci\";\n",
"+\t\t\treg = <0xe90000 0x10000>;\n",
"+\t\t\tinterrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;\n",
"+\t\t\tstatus = \"disable\";\n",
"+\t\t};\n",
"+\n",
- " \t\tapb\@fc0000 {\n",
+ " \t\tapb at fc0000 {\n",
" \t\t\tcompatible = \"simple-bus\";\n",
" \t\t\t#address-cells = <1>;\n",
"-- \n",
"1.8.3.2"
]
-f152663d315527e3ede459fbf9aa5112887f07cfe5b30499632ede73a5994357
+fef340696d0c478c1567a4032e4218f4cbc4e3e8d5d777ddd3c7effe0fbdadbc
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.