diff for duplicates of <20130810110955.GA11437@amd.pavel.ucw.cz>
diff --git a/a/content_digest b/N1/content_digest
index e0a0730..9acd480 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -44,13 +44,13 @@
" Andrew Morton <akpm\@osdl.org>\0"
]
[
- "Cc\0Tony Lindgren <tony\@atomide.com>",
+ "Cc\0trivial\@kernel.org",
" b-cousson\@ti.com",
- " pali.rohar\@gmail.com",
+ " Tony Lindgren <tony\@atomide.com>",
" kernel list <linux-kernel\@vger.kernel.org>",
- " linux-arm-kernel <linux-arm-kernel\@lists.infradead.org>",
+ " pali.rohar\@gmail.com",
" linux-omap\@vger.kernel.org",
- " trivial\@kernel.org\0"
+ " linux-arm-kernel <linux-arm-kernel\@lists.infradead.org>\0"
]
[
"\0000:1\0"
@@ -224,4 +224,4 @@
"(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html"
]
-6528006e4293bc067b97658e286d97d6689f6ad37781981dfcd1464b1fa66a50
+423b0ed8524b5488fc30ec82f7750e7bbf9f48ae9d05af0a718ca1faef5dfd33
diff --git a/a/1.txt b/N2/1.txt
index 24e35c4..7d188bc 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -83,7 +83,7 @@ index 0000000..fb461bf
+ compatible = "nokia,omap3-n900", "ti,omap3";
+
+ cpus {
-+ cpu@0 {
++ cpu at 0 {
+ cpu0-supply = <&vcc>;
+ };
+ };
@@ -98,7 +98,7 @@ index 0000000..fb461bf
+&i2c1 {
+ clock-frequency = <2200000>;
+
-+ twl: twl@48 {
++ twl: twl at 48 {
+ reg = <0x48>;
+ interrupts = <7>; /* SYS_NIRQ cascaded to intc */
+ interrupt-parent = <&intc>;
@@ -137,12 +137,12 @@ index 0000000..fb461bf
+ // all on real hw. It works well without it on emulator.
+ //
+ // 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/N2/content_digest
index e0a0730..c1a6e31 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -29,28 +29,16 @@
"ref\00020130801234355.GA15611\@amd.pavel.ucw.cz\0"
]
[
- "From\0Pavel Machek <pavel\@ucw.cz>\0"
+ "From\0pavel\@ucw.cz (Pavel Machek)\0"
]
[
- "Subject\0Re: [PATCH v2] N900: add device tree\0"
+ "Subject\0[PATCH v2] N900: add device tree\0"
]
[
"Date\0Sat, 10 Aug 2013 13:09:56 +0200\0"
]
[
- "To\0Aaro Koskinen <aaro.koskinen\@iki.fi>",
- " olof\@lixom.net",
- " arnd\@arndb.de",
- " Andrew Morton <akpm\@osdl.org>\0"
-]
-[
- "Cc\0Tony 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",
- " trivial\@kernel.org\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -144,7 +132,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",
@@ -159,7 +147,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",
@@ -198,12 +186,12 @@
"+\t// all on real hw. It works well without it on emulator.\n",
"+\t//\n",
"+\t// Also... order in the device tree actually matters here.\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",
@@ -224,4 +212,4 @@
"(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html"
]
-6528006e4293bc067b97658e286d97d6689f6ad37781981dfcd1464b1fa66a50
+c8148aee498f6040ba1e14d16ab00037c1ea250a8343426a4214b9fbe7732a74
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.