diff for duplicates of <522144AB.9010802@ti.com> diff --git a/a/1.txt b/N1/1.txt index cc66648..06e9967 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -49,7 +49,7 @@ index 5996d63..f5869ed 100644 reg = <0x48200000 0x1000>; }; -+ edma: dma-controller@49000000 { ++ edma: dma-controller at 49000000 { + compatible = "ti,edma3"; + ti,hwmods = "tpcc", "tptc0", "tptc1", "tptc2"; + reg = <0x49000000 0x10000>, @@ -61,7 +61,7 @@ index 5996d63..f5869ed 100644 + ti,edma-slots = <256>; + }; + - gpio0: gpio@44e07000 { + gpio0: gpio at 44e07000 { compatible = "ti,omap4-gpio"; ti,hwmods = "gpio1"; -- diff --git a/a/content_digest b/N1/content_digest index 0ef7e2f..4c7cc44 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,16 +1,9 @@ "ref\01377505784-9820-1-git-send-email-bigeasy@linutronix.de\0" "ref\0521B1380.3030908@baylibre.com\0" - "From\0Joel Fernandes <joelf@ti.com>\0" - "Subject\0Re: [PATCH v2] ARM: dts: add AM33XX EDMA support\0" + "From\0joelf@ti.com (Joel Fernandes)\0" + "Subject\0[PATCH v2] ARM: dts: add AM33XX EDMA support\0" "Date\0Fri, 30 Aug 2013 20:19:39 -0500\0" - "To\0Benoit Cousson <bcousson@baylibre.com>\0" - "Cc\0devicetree@vger.kernel.org" - tony@atomide.com - Sebastian Andrzej Siewior <bigeasy@linutronix.de> - linux-kernel@vger.kernel.org - santosh.shilimkar@ti.com - linux-omap@vger.kernel.org - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi Benoit,\n" @@ -64,7 +57,7 @@ " \t\t\treg = <0x48200000 0x1000>;\n" " \t\t};\n" "\n" - "+\t\tedma: dma-controller@49000000 {\n" + "+\t\tedma: dma-controller at 49000000 {\n" "+\t\t\tcompatible = \"ti,edma3\";\n" "+\t\t\tti,hwmods = \"tpcc\", \"tptc0\", \"tptc1\", \"tptc2\";\n" "+\t\t\treg =\t<0x49000000 0x10000>,\n" @@ -76,10 +69,10 @@ "+\t\t\tti,edma-slots = <256>;\n" "+\t\t};\n" "+\n" - " \t\tgpio0: gpio@44e07000 {\n" + " \t\tgpio0: gpio at 44e07000 {\n" " \t\t\tcompatible = \"ti,omap4-gpio\";\n" " \t\t\tti,hwmods = \"gpio1\";\n" "-- \n" 1.8.1.2 -fbf710c04e3c0a6c70ee98fc96e719335cc28fc78efa45ad445e4f55ad8c258c +01790958e1622cdf3c6d74c4f5009f0675d4208544ccd6bd91ba01892a1f959f
diff --git a/a/content_digest b/N2/content_digest index 0ef7e2f..adda8e4 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -4,13 +4,13 @@ "Subject\0Re: [PATCH v2] ARM: dts: add AM33XX EDMA support\0" "Date\0Fri, 30 Aug 2013 20:19:39 -0500\0" "To\0Benoit Cousson <bcousson@baylibre.com>\0" - "Cc\0devicetree@vger.kernel.org" - tony@atomide.com - Sebastian Andrzej Siewior <bigeasy@linutronix.de> - linux-kernel@vger.kernel.org - santosh.shilimkar@ti.com - linux-omap@vger.kernel.org - " linux-arm-kernel@lists.infradead.org\0" + "Cc\0Sebastian Andrzej Siewior <bigeasy@linutronix.de>" + <tony@atomide.com> + <santosh.shilimkar@ti.com> + <linux-omap@vger.kernel.org> + <devicetree@vger.kernel.org> + <linux-arm-kernel@lists.infradead.org> + " <linux-kernel@vger.kernel.org>\0" "\00:1\0" "b\0" "Hi Benoit,\n" @@ -82,4 +82,4 @@ "-- \n" 1.8.1.2 -fbf710c04e3c0a6c70ee98fc96e719335cc28fc78efa45ad445e4f55ad8c258c +393c917ab5afc08404eb569aa4fe85a7fa0dccbd05388980f452a84992b0ddae
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.