diff for duplicates of <20130813133636.GA12364@amd.pavel.ucw.cz>
diff --git a/a/1.txt b/N1/1.txt
index 81cb38a..be955bb 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -72,7 +72,7 @@ index 0000000..7ff90f8
+ compatible = "nokia,omap3-n900", "ti,omap3";
+
+ cpus {
-+ cpu@0 {
++ cpu at 0 {
+ cpu0-supply = <&vcc>;
+ };
+ };
@@ -87,7 +87,7 @@ index 0000000..7ff90f8
+&i2c1 {
+ clock-frequency = <2200000>;
+
-+ twl: twl@48 {
++ twl: twl at 48 {
+ reg = <0x48>;
+ interrupts = <7>; /* SYS_NIRQ cascaded to intc */
+ interrupt-parent = <&intc>;
@@ -128,12 +128,12 @@ index 0000000..7ff90f8
+ *
+ * Also... order in the device tree actually matters here.
+ */
-+ tsc2005@0 {
++ tsc2005 at 0 {
+ compatible = "tsc2005";
+ spi-max-frequency = <6000000>;
+ reg = <0>;
+ };
-+ mipid@2 {
++ mipid at 2 {
+ compatible = "acx565akm";
+ spi-max-frequency = <6000000>;
+ reg = <2>;
diff --git a/a/content_digest b/N1/content_digest
index aa296c5..fc22443 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -29,7 +29,7 @@
"ref\000520A0F5B.5080502\@baylibre.com\0"
]
[
- "From\0Pavel Machek <pavel\@ucw.cz>\0"
+ "From\0pavel\@ucw.cz (Pavel Machek)\0"
]
[
"Subject\0[PATCH v3] N900: add device tree\0"
@@ -38,17 +38,7 @@
"Date\0Tue, 13 Aug 2013 15:36:36 +0200\0"
]
[
- "To\0Benoit Cousson <bcousson\@baylibre.com>\0"
-]
-[
- "Cc\0Javier Martinez Canillas <martinez.javier\@gmail.com>",
- " Aaro Koskinen <aaro.koskinen\@iki.fi>",
- " Tony Lindgren <tony\@atomide.com>",
- " b-cousson\@ti.com",
- " pali.rohar\@gmail.com",
- " kernel list <linux-kernel\@vger.kernel.org>",
- " linux-arm-kernel <linux-arm-kernel\@lists.infradead.org>",
- " linux-omap\@vger.kernel.org\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -131,7 +121,7 @@
"+\tcompatible = \"nokia,omap3-n900\", \"ti,omap3\";\n",
"+\n",
"+\tcpus {\n",
- "+\t\tcpu\@0 {\n",
+ "+\t\tcpu at 0 {\n",
"+\t\t\tcpu0-supply = <&vcc>;\n",
"+\t\t};\n",
"+\t};\n",
@@ -146,7 +136,7 @@
"+&i2c1 {\n",
"+\tclock-frequency = <2200000>;\n",
"+\n",
- "+\ttwl: twl\@48 {\n",
+ "+\ttwl: twl at 48 {\n",
"+\t\treg = <0x48>;\n",
"+\t\tinterrupts = <7>; /* SYS_NIRQ cascaded to intc */\n",
"+\t\tinterrupt-parent = <&intc>;\n",
@@ -187,12 +177,12 @@
"+\t *\n",
"+\t * Also... order in the device tree actually matters here.\n",
"+\t */\n",
- "+\ttsc2005\@0 {\n",
+ "+\ttsc2005 at 0 {\n",
"+\t\tcompatible = \"tsc2005\";\n",
"+\t\tspi-max-frequency = <6000000>;\n",
"+\t\treg = <0>;\n",
"+\t};\n",
- "+\tmipid\@2 {\n",
+ "+\tmipid at 2 {\n",
"+\t\tcompatible = \"acx565akm\";\n",
"+\t\tspi-max-frequency = <6000000>;\n",
"+\t\treg = <2>;\n",
@@ -211,4 +201,4 @@
"(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html"
]
-460b955b97afcdd2fb2a25c0e37c5a24d7ceef73cb157ea47d5abda907381df6
+2df783672a064dd42d4b64721970d2359c335b0750cb62b7109364059504d42f
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.