diff for duplicates of <20140422182802.447c2912@skate>
diff --git a/a/1.txt b/N1/1.txt
index ca2ab29..f598b18 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,6 +1,6 @@
-Dear Antoine Ténart,
+Dear Antoine T?nart,
-On Tue, 22 Apr 2014 17:38:22 +0200, Antoine Ténart wrote:
+On Tue, 22 Apr 2014 17:38:22 +0200, Antoine T?nart wrote:
> The BG2Q has an AHCI SATA controller. Add the corresponding node
> in its device tree.
@@ -19,19 +19,19 @@ Thomas
> };
> };
>
-> + ahci: sata@e90000 {
+> + ahci: sata at e90000 {
> + compatible = "marvell,berlin-ahci";
> + reg = <0xe90000 0x10000>;
> + interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
> + status = "disable";
> + };
> +
-> + generic-regs@ea0110 {
+> + generic-regs at ea0110 {
> + compatible = "marvell,berlin-generic-regs", "syscon";
> + reg = <0xea0110 0x10>;
> + };
> +
-> apb@fc0000 {
+> apb at fc0000 {
> compatible = "simple-bus";
> #address-cells = <1>;
diff --git a/a/content_digest b/N1/content_digest
index 17580a8..5842a76 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -5,27 +5,16 @@
"ref\0001398181105-19714-4-git-send-email-antoine.tenart\@free-electrons.com\0"
]
[
- "From\0Thomas Petazzoni <thomas.petazzoni\@free-electrons.com>\0"
+ "From\0thomas.petazzoni\@free-electrons.com (Thomas Petazzoni)\0"
]
[
- "Subject\0Re: [PATCH 3/6] ARM: berlin: add the AHCI node for the BG2Q\0"
+ "Subject\0[PATCH 3/6] ARM: berlin: add the AHCI node for the BG2Q\0"
]
[
"Date\0Tue, 22 Apr 2014 18:28:02 +0200\0"
]
[
- "To\0Antoine T\303\251nart <antoine.tenart\@free-electrons.com>\0"
-]
-[
- "Cc\0sebastian.hesselbarth\@gmail.com",
- " tj\@kernel.org",
- " zmxu\@marvell.com",
- " jszhang\@marvell.com",
- " devicetree\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org",
- " linux-ide\@vger.kernel.org",
- " alexandre.belloni\@free-electrons.com",
- " linux-arm-kernel\@lists.infradead.org\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -34,9 +23,9 @@
"b\0"
]
[
- "Dear Antoine T\303\251nart,\n",
+ "Dear Antoine T?nart,\n",
"\n",
- "On Tue, 22 Apr 2014 17:38:22 +0200, Antoine T\303\251nart wrote:\n",
+ "On Tue, 22 Apr 2014 17:38:22 +0200, Antoine T?nart wrote:\n",
"> The BG2Q has an AHCI SATA controller. Add the corresponding node\n",
"> in its device tree.\n",
"\n",
@@ -55,19 +44,19 @@
"> \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\tgeneric-regs\@ea0110 {\n",
+ "> +\t\tgeneric-regs at ea0110 {\n",
"> +\t\t\tcompatible = \"marvell,berlin-generic-regs\", \"syscon\";\n",
"> +\t\t\treg = <0xea0110 0x10>;\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",
@@ -79,4 +68,4 @@
"http://free-electrons.com"
]
-95fefccd4b3025167bef608e7d75856ed2291acec186bbc44caae90a1e73a308
+a612dda08eb4d767188426e3caf4c50922347a304892514c57e16dc317522141
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.