diff for duplicates of <1342777047.1726.435.camel@vkoul-udesk3>
diff --git a/a/1.txt b/N1/1.txt
index f7be807..750536e 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -34,7 +34,7 @@ channel"
> > > 4. A dma controller requiring complex configuration:
> > >
-> > > dma: dmaengine@48000000 {
+> > > dma: dmaengine at 48000000 {
> > > compatible = "foo,foo-sdma"
> > > reg = <0x48000000 0x1000>;
> > > interrupts = <4>;
diff --git a/a/content_digest b/N1/content_digest
index 5b8c871..89abd8f 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -11,31 +11,16 @@
"ref\000201207200839.24259.arnd\@arndb.de\0"
]
[
- "From\0Vinod Koul <vinod.koul\@linux.intel.com>\0"
+ "From\0vinod.koul\@linux.intel.com (Vinod Koul)\0"
]
[
- "Subject\0Re: [PATCH V3 1/2] of: Add generic device tree DMA helpers\0"
+ "Subject\0[PATCH V3 1/2] of: Add generic device tree DMA helpers\0"
]
[
"Date\0Fri, 20 Jul 2012 15:07:27 +0530\0"
]
[
- "To\0Arnd Bergmann <arnd\@arndb.de>\0"
-]
-[
- "Cc\0linux-arm-kernel\@lists.infradead.org",
- " Stephen Warren <swarren\@nvidia.com>",
- " Benoit Cousson <b-cousson\@ti.com>",
- " Stephen Warren <swarren\@wwwdotorg.org>",
- " device-tree <devicetree-discuss\@lists.ozlabs.org>",
- " Nicolas Ferre <nicolas.ferre\@atmel.com>",
- " Rob Herring <rob.herring\@calxeda.com>",
- " Grant Likely <grant.likely\@secretlab.ca>",
- " Jassi Brar <jaswinder.singh\@linaro.org>",
- " Jon Hunter <jon-hunter\@ti.com>",
- " Russell King - ARM Linux <linux\@arm.linux.org.uk>",
- " dan.j.williams\@intel.com",
- " linux-omap <linux-omap\@vger.kernel.org>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -80,7 +65,7 @@
"\n",
"> > > 4. A dma controller requiring complex configuration:\n",
"> > > \n",
- "> > > dma: dmaengine\@48000000 {\n",
+ "> > > dma: dmaengine at 48000000 {\n",
"> > > compatible = \"foo,foo-sdma\"\n",
"> > > reg = <0x48000000 0x1000>;\n",
"> > > interrupts = <4>;\n",
@@ -112,4 +97,4 @@
"~Vinod"
]
-6a2ae4cacb40dabf980695087b1ae41d4b6d5d9c567b9794f0fd18fec9ff9cf8
+cbfcc38d9668b83e065be787c9c7c1f7de7826eb262437d45eb6804ba5c004b4
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.