diff for duplicates of <20130228042446.GC28537@intel.com> diff --git a/a/1.txt b/N1/1.txt index debdb38..425f198 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -42,8 +42,8 @@ I will send PULL to linus this evening... > Acked-by: Viresh Kumar <viresh.kumar@linaro.org> > Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Cc: Vinod Koul <vinod.koul@linux.intel.com> -> Cc: devicetree-discuss@lists.ozlabs.org -> Cc: linux-arm-kernel@lists.infradead.org +> Cc: devicetree-discuss at lists.ozlabs.org +> Cc: linux-arm-kernel at lists.infradead.org > > diff --git a/Documentation/devicetree/bindings/dma/snps-dma.txt b/Documentation/devicetree/bindings/dma/snps-dma.txt > index 5bb3dfb..d58675e 100644 @@ -90,8 +90,8 @@ I will send PULL to linus this evening... > > Example: > -> - dma@fc000000 { -> + dmahost: dma@fc000000 { +> - dma at fc000000 { +> + dmahost: dma at fc000000 { > compatible = "snps,dma-spear1340"; > reg = <0xfc000000 0x1000>; > interrupt-parent = <&vic1>; @@ -136,7 +136,7 @@ I will send PULL to linus this evening... > + > +Example: > + -> + serial@e0000000 { +> + serial at e0000000 { > + compatible = "arm,pl011", "arm,primecell"; > + reg = <0xe0000000 0x1000>; > + interrupts = <0 35 0x4>; diff --git a/a/content_digest b/N1/content_digest index 0ac06ad..16029e1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,18 +2,10 @@ "ref\020130226225205.GA13338@animalcreek.com\0" "ref\020130227053109.GA28537@intel.com\0" "ref\0201302272136.04100.arnd@arndb.de\0" - "From\0Vinod Koul <vinod.koul@intel.com>\0" - "Subject\0Re: crypto: omap-sham, omap-aes and dma_request_slave_channel_compat()\0" + "From\0vinod.koul@intel.com (Vinod Koul)\0" + "Subject\0crypto: omap-sham, omap-aes and dma_request_slave_channel_compat()\0" "Date\0Thu, 28 Feb 2013 09:54:46 +0530\0" - "To\0Arnd Bergmann <arnd@arndb.de>\0" - "Cc\0Mark A. Greer <mgreer@animalcreek.com>" - Tim Gardner <tim.gardner@canonical.com> - herbert@gondor.hengli.com.au - dmitry.kasatkin@intel.com - linux-kernel@vger.kernel.org - Tony Lindgren <tony@atomide.com> - linux-arm-kernel <linux-arm-kernel@lists.infradead.org> - " linux-omap <linux-omap@vger.kernel.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Wed, Feb 27, 2013 at 09:36:03PM +0000, Arnd Bergmann wrote:\n" @@ -60,8 +52,8 @@ "> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>\n" "> Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>\n" "> Cc: Vinod Koul <vinod.koul@linux.intel.com>\n" - "> Cc: devicetree-discuss@lists.ozlabs.org\n" - "> Cc: linux-arm-kernel@lists.infradead.org\n" + "> Cc: devicetree-discuss at lists.ozlabs.org\n" + "> Cc: linux-arm-kernel at lists.infradead.org\n" "> \n" "> diff --git a/Documentation/devicetree/bindings/dma/snps-dma.txt b/Documentation/devicetree/bindings/dma/snps-dma.txt\n" "> index 5bb3dfb..d58675e 100644\n" @@ -108,8 +100,8 @@ "> \n" "> Example:\n" "> \n" - "> -\tdma@fc000000 {\n" - "> +\tdmahost: dma@fc000000 {\n" + "> -\tdma at fc000000 {\n" + "> +\tdmahost: dma at fc000000 {\n" "> \t\tcompatible = \"snps,dma-spear1340\";\n" "> \t\treg = <0xfc000000 0x1000>;\n" "> \t\tinterrupt-parent = <&vic1>;\n" @@ -154,7 +146,7 @@ "> +\n" "> +Example:\n" "> +\t\n" - "> +\tserial@e0000000 {\n" + "> +\tserial at e0000000 {\n" "> +\t\tcompatible = \"arm,pl011\", \"arm,primecell\";\n" "> +\t\treg = <0xe0000000 0x1000>;\n" "> +\t\tinterrupts = <0 35 0x4>;\n" @@ -452,4 +444,4 @@ "> \n" > #endif /* DW_DMAC_H */ -fa80d4bcd3b329a91de18e6040dc760642566a8b290c97ec43f810a0d7e95811 +6a71e08859f91451951c4748450db063b65281fbf79a3ac598df3c2e993f2cf6
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.