diff for duplicates of <1422540556-14828-2-git-send-email-mpa@pengutronix.de>
diff --git a/a/1.txt b/N1/1.txt
index 6bd1c9b..60a1d6f 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -43,7 +43,7 @@ index 000000000000..a857af0eb68c
+The first queue is for the touchscreen, the second for general purpose ADC.
+
+Example:
-+ tscadc: tscadc@50030000 {
++ tscadc: tscadc at 50030000 {
+ compatible = "fsl,imx25-tsadc";
+ reg = <0x50030000 0xc>;
+ interrupts = <46>;
@@ -55,13 +55,13 @@ index 000000000000..a857af0eb68c
+ #size-cells = <1>;
+ ranges;
+
-+ tsc: tcq@50030400 {
++ tsc: tcq at 50030400 {
+ compatible = "fsl,imx25-tcq";
+ reg = <0x50030400 0x60>;
+ ...
+ };
+
-+ adc: gcq@50030800 {
++ adc: gcq at 50030800 {
+ compatible = "fsl,imx25-gcq";
+ reg = <0x50030800 0x60>;
+ ...
diff --git a/a/content_digest b/N1/content_digest
index 8e08ad9..1625f96 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
"ref\0001422540556-14828-1-git-send-email-mpa\@pengutronix.de\0"
]
[
- "From\0Markus Pargmann <mpa\@pengutronix.de>\0"
+ "From\0mpa\@pengutronix.de (Markus Pargmann)\0"
]
[
"Subject\0[PATCH v6 1/8] ARM: dt: Binding documentation for imx25 ADC/TSC\0"
@@ -11,30 +11,7 @@
"Date\0Thu, 29 Jan 2015 15:09:09 +0100\0"
]
[
- "To\0Shawn Guo <shawn.guo\@linaro.org>",
- " Samuel Ortiz <sameo\@linux.intel.com>",
- " Dmitry Torokhov <dmitry.torokhov\@gmail.com>",
- " Jonathan Cameron <jic23\@kernel.org>",
- " Fabio Estevam <festevam\@gmail.com>",
- " Peter Meerwald <pmeerw\@pmeerw.net>",
- " Hartmut Knaack <knaack.h\@gmx.de>\0"
-]
-[
- "Cc\0Denis Carikli <denis\@eukrea.com>",
- " Eric B\303\251nard <eric\@eukrea.com>",
- " Sascha Hauer <kernel\@pengutronix.de>",
- " linux-arm-kernel\@lists.infradead.org",
- " Lee Jones <lee.jones\@linaro.org>",
- " linux-input\@vger.kernel.org",
- " linux-iio\@vger.kernel.org",
- " Lars-Peter Clausen <lars\@metafoo.de>",
- " devicetree\@vger.kernel.org",
- " Rob Herring <robh+dt\@kernel.org>",
- " Pawel Moll <pawel.moll\@arm.com>",
- " Mark Rutland <mark.rutland\@arm.com>",
- " Ian Campbell <ijc+devicetree\@hellion.org.uk>",
- " Kumar Gala <galak\@codeaurora.org>",
- " Markus Pargmann <mpa\@pengutronix.de>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -88,7 +65,7 @@
"+The first queue is for the touchscreen, the second for general purpose ADC.\n",
"+\n",
"+Example:\n",
- "+\ttscadc: tscadc\@50030000 {\n",
+ "+\ttscadc: tscadc at 50030000 {\n",
"+\t\tcompatible = \"fsl,imx25-tsadc\";\n",
"+\t\treg = <0x50030000 0xc>;\n",
"+\t\tinterrupts = <46>;\n",
@@ -100,13 +77,13 @@
"+\t\t#size-cells = <1>;\n",
"+\t\tranges;\n",
"+\n",
- "+\t\ttsc: tcq\@50030400 {\n",
+ "+\t\ttsc: tcq at 50030400 {\n",
"+\t\t\tcompatible = \"fsl,imx25-tcq\";\n",
"+\t\t\treg = <0x50030400 0x60>;\n",
"+\t\t\t...\n",
"+\t\t};\n",
"+\n",
- "+\t\tadc: gcq\@50030800 {\n",
+ "+\t\tadc: gcq at 50030800 {\n",
"+\t\t\tcompatible = \"fsl,imx25-gcq\";\n",
"+\t\t\treg = <0x50030800 0x60>;\n",
"+\t\t\t...\n",
@@ -116,4 +93,4 @@
"2.1.4"
]
-92ff19a31d9e26c538b2ac065040494cfbe70342bbc8d9456f970b83ff4f11f7
+87c0777acf2dad501b9b1896f9649fbc1ff8bcb6799f839d6dbd5716e04687a3
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.