diff for duplicates of <201302272136.04100.arnd@arndb.de> diff --git a/a/1.txt b/N1/1.txt index 3ec1534..3208f23 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -35,8 +35,8 @@ Signed-off-by: Arnd Bergmann <arnd@arndb.de> 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 @@ -83,8 +83,8 @@ index 5bb3dfb..d58675e 100644 Example: -- dma@fc000000 { -+ dmahost: dma@fc000000 { +- dma at fc000000 { ++ dmahost: dma at fc000000 { compatible = "snps,dma-spear1340"; reg = <0xfc000000 0x1000>; interrupt-parent = <&vic1>; @@ -129,7 +129,7 @@ index 5bb3dfb..d58675e 100644 + +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 4473b2c..62c6b8f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,18 +1,10 @@ "ref\0512D00BE.8090204@canonical.com\0" "ref\020130226225205.GA13338@animalcreek.com\0" "ref\020130227053109.GA28537@intel.com\0" - "From\0Arnd Bergmann <arnd@arndb.de>\0" - "Subject\0Re: crypto: omap-sham, omap-aes and dma_request_slave_channel_compat()\0" + "From\0arnd@arndb.de (Arnd Bergmann)\0" + "Subject\0crypto: omap-sham, omap-aes and dma_request_slave_channel_compat()\0" "Date\0Wed, 27 Feb 2013 21:36:03 +0000\0" - "To\0Vinod Koul <vinod.koul@intel.com>\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 Wednesday 27 February 2013, Vinod Koul wrote:\n" @@ -52,8 +44,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" @@ -100,8 +92,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" @@ -146,7 +138,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" @@ -444,4 +436,4 @@ " \n" #endif /* DW_DMAC_H */ -bae5df726a26d0358464777de29a2baa79cbef6354c0ce9840841b89de035c3c +4900ea20098baa20828670882551928be9a12d7f7aad07c00f5e26ce5a6dd221
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.