diff for duplicates of <1370962138-9631-3-git-send-email-florian.vaussard@epfl.ch>
diff --git a/a/1.txt b/N1/1.txt
index a9fa7b8..9341184 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -17,7 +17,7 @@ index e112a42..811b74c 100644
+&gpmc {
+ ranges = <0 0 0x30000000 0x00000004>; /* CS0: NAND */
+
-+ nand@0,0 {
++ nand at 0,0 {
+ reg = <0 0 0>; /* CS0, offset 0 */
+ nand-bus-width = <16>;
+
@@ -42,23 +42,23 @@ index e112a42..811b74c 100644
+ #address-cells = <1>;
+ #size-cells = <1>;
+
-+ xloader@0 {
++ xloader at 0 {
+ reg = <(0 * SZ_128K) (4 * SZ_128K)>;
+ };
+
-+ uboot@80000 {
++ uboot at 80000 {
+ reg = <(4 * SZ_128K) (14 * SZ_128K)>;
+ };
+
-+ ubootenv@240000 {
++ ubootenv at 240000 {
+ reg = <(18 * SZ_128K) (2 * SZ_128K)>;
+ };
+
-+ linux@280000 {
++ linux at 280000 {
+ reg = <(20 * SZ_128K) (32 * SZ_128K)>;
+ };
+
-+ rootfs@680000 {
++ rootfs at 680000 {
+ reg = <(52 * SZ_128K) MTDPART_SIZ_FULL>;
+ };
+ };
diff --git a/a/content_digest b/N1/content_digest
index d1faf0f..189c114 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
"ref\0001370962138-9631-1-git-send-email-florian.vaussard\@epfl.ch\0"
]
[
- "From\0Florian Vaussard <florian.vaussard\@epfl.ch>\0"
+ "From\0florian.vaussard\@epfl.ch (Florian Vaussard)\0"
]
[
"Subject\0[PATCH 2/3] ARM: dts: Add omap3-overo NAND flash memory binding\0"
@@ -11,17 +11,7 @@
"Date\0Tue, 11 Jun 2013 16:48:57 +0200\0"
]
[
- "To\0Benoit Cousson <b-cousson\@ti.com>\0"
-]
-[
- "Cc\0Tony Lindgren <tony\@atomide.com>",
- " Stephen Warren <swarren\@wwwdotorg.org>",
- " Javier Martinez Canillas <javier.martinez\@collabora.co.uk>",
- " Anil Kumar <anilk4.v\@gmail.com>",
- " linux-omap\@vger.kernel.org",
- " devicetree-discuss\@lists.ozlabs.org",
- " linux-arm-kernel\@lists.infradead.org",
- " Florian Vaussard <florian.vaussard\@epfl.ch>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -49,7 +39,7 @@
"+&gpmc {\n",
"+\tranges = <0 0 0x30000000 0x00000004>; /* CS0: NAND */\n",
"+\n",
- "+\tnand\@0,0 {\n",
+ "+\tnand at 0,0 {\n",
"+\t\treg = <0 0 0>; /* CS0, offset 0 */\n",
"+\t\tnand-bus-width = <16>;\n",
"+\n",
@@ -74,23 +64,23 @@
"+\t\t#address-cells = <1>;\n",
"+\t\t#size-cells = <1>;\n",
"+\n",
- "+\t\txloader\@0 {\n",
+ "+\t\txloader at 0 {\n",
"+\t\t\treg = <(0 * SZ_128K) (4 * SZ_128K)>;\n",
"+\t\t};\n",
"+\n",
- "+\t\tuboot\@80000 {\n",
+ "+\t\tuboot at 80000 {\n",
"+\t\t\treg = <(4 * SZ_128K) (14 * SZ_128K)>;\n",
"+\t\t};\n",
"+\n",
- "+\t\tubootenv\@240000 {\n",
+ "+\t\tubootenv at 240000 {\n",
"+\t\t\treg = <(18 * SZ_128K) (2 * SZ_128K)>;\n",
"+\t\t};\n",
"+\n",
- "+\t\tlinux\@280000 {\n",
+ "+\t\tlinux at 280000 {\n",
"+\t\t\treg = <(20 * SZ_128K) (32 * SZ_128K)>;\n",
"+\t\t};\n",
"+\n",
- "+\t\trootfs\@680000 {\n",
+ "+\t\trootfs at 680000 {\n",
"+\t\t\treg = <(52 * SZ_128K) MTDPART_SIZ_FULL>;\n",
"+\t\t};\n",
"+\t};\n",
@@ -117,4 +107,4 @@
"1.7.5.4"
]
-8e9ff7b2b4b07502d8affc28d36450619409af66328a8f84722ddd5ecc8fbf29
+6769d8dfb136f9a34be67bb0a30901807a9365a422cc636989fee90be59234a0
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.