diff for duplicates of <521DCD33.2070008@gmail.com> diff --git a/a/1.txt b/N1/1.txt index f72c266..4f4dae4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -16,7 +16,7 @@ On 08/28/2013 11:34 AM, Jean-Francois Moine wrote: > }; > }; > + -> + i2s0: audio-controller at b0000 { +> + i2s0: audio-controller@b0000 { > + compatible = "marvell,mvebu-audio"; [added Gregory to Cc] @@ -36,7 +36,7 @@ Sebastian > + status = "disabled"; > + }; > + -> + i2s1: audio-controller at b4000 { +> + i2s1: audio-controller@b4000 { > + compatible = "marvell,mvebu-audio"; > + reg = <0xb4000 0x2210>; > + interrupts = <21>, <22>; diff --git a/a/content_digest b/N1/content_digest index 99bf710..a3be015 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,19 @@ "ref\020130828113459.48ecbb34@armhf\0" - "From\0sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth)\0" - "Subject\0[PATCH 1/2] ARM: Dove: Add the audio devices in DT\0" + "From\0Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0" + "Subject\0Re: [PATCH 1/2] ARM: Dove: Add the audio devices in DT\0" "Date\0Wed, 28 Aug 2013 12:13:07 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Jean-Francois Moine <moinejf@free.fr>\0" + "Cc\0Mark Rutland <mark.rutland@arm.com>" + devicetree@vger.kernel.org + Russell King <linux@arm.linux.org.uk> + Jason Cooper <jason@lakedaemon.net> + Pawel Moll <pawel.moll@arm.com> + Stephen Warren <swarren@wwwdotorg.org> + linux-kernel@vger.kernel.org + Rob Herring <rob.herring@calxeda.com> + Gregory CLEMENT <gregory.clement@free-electrons.com> + linux-arm-kernel@lists.infradead.org + " Ian Campbell <ian.campbell@citrix.com>\0" "\00:1\0" "b\0" "On 08/28/2013 11:34 AM, Jean-Francois Moine wrote:\n" @@ -23,7 +34,7 @@ "> \t\t\t\t};\n" "> \t\t\t};\n" "> +\n" - "> +\t\t\ti2s0: audio-controller at b0000 {\n" + "> +\t\t\ti2s0: audio-controller@b0000 {\n" "> +\t\t\t\tcompatible = \"marvell,mvebu-audio\";\n" "\n" "[added Gregory to Cc]\n" @@ -43,7 +54,7 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\ti2s1: audio-controller at b4000 {\n" + "> +\t\t\ti2s1: audio-controller@b4000 {\n" "> +\t\t\t\tcompatible = \"marvell,mvebu-audio\";\n" "> +\t\t\t\treg = <0xb4000 0x2210>;\n" "> +\t\t\t\tinterrupts = <21>, <22>;\n" @@ -57,4 +68,4 @@ ">\n" > -fe3c3b06de8042eddce90bc2cd23648498436c944492e72b7d3c233ab963107b +1ebe44eff1ae2d4d6aebaf5479159e5753d8e935d75a776fc9268b11439b79d6
diff --git a/a/1.txt b/N2/1.txt index f72c266..4f4dae4 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -16,7 +16,7 @@ On 08/28/2013 11:34 AM, Jean-Francois Moine wrote: > }; > }; > + -> + i2s0: audio-controller at b0000 { +> + i2s0: audio-controller@b0000 { > + compatible = "marvell,mvebu-audio"; [added Gregory to Cc] @@ -36,7 +36,7 @@ Sebastian > + status = "disabled"; > + }; > + -> + i2s1: audio-controller at b4000 { +> + i2s1: audio-controller@b4000 { > + compatible = "marvell,mvebu-audio"; > + reg = <0xb4000 0x2210>; > + interrupts = <21>, <22>; diff --git a/a/content_digest b/N2/content_digest index 99bf710..09be5c8 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,19 @@ "ref\020130828113459.48ecbb34@armhf\0" - "From\0sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth)\0" - "Subject\0[PATCH 1/2] ARM: Dove: Add the audio devices in DT\0" + "From\0Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0" + "Subject\0Re: [PATCH 1/2] ARM: Dove: Add the audio devices in DT\0" "Date\0Wed, 28 Aug 2013 12:13:07 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Jean-Francois Moine <moinejf@free.fr>\0" + "Cc\0linux-arm-kernel@lists.infradead.org" + Jason Cooper <jason@lakedaemon.net> + Rob Herring <rob.herring@calxeda.com> + Pawel Moll <pawel.moll@arm.com> + Mark Rutland <mark.rutland@arm.com> + Stephen Warren <swarren@wwwdotorg.org> + Ian Campbell <ian.campbell@citrix.com> + Russell King <linux@arm.linux.org.uk> + devicetree@vger.kernel.org + linux-kernel@vger.kernel.org + " Gregory CLEMENT <gregory.clement@free-electrons.com>\0" "\00:1\0" "b\0" "On 08/28/2013 11:34 AM, Jean-Francois Moine wrote:\n" @@ -23,7 +34,7 @@ "> \t\t\t\t};\n" "> \t\t\t};\n" "> +\n" - "> +\t\t\ti2s0: audio-controller at b0000 {\n" + "> +\t\t\ti2s0: audio-controller@b0000 {\n" "> +\t\t\t\tcompatible = \"marvell,mvebu-audio\";\n" "\n" "[added Gregory to Cc]\n" @@ -43,7 +54,7 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\ti2s1: audio-controller at b4000 {\n" + "> +\t\t\ti2s1: audio-controller@b4000 {\n" "> +\t\t\t\tcompatible = \"marvell,mvebu-audio\";\n" "> +\t\t\t\treg = <0xb4000 0x2210>;\n" "> +\t\t\t\tinterrupts = <21>, <22>;\n" @@ -57,4 +68,4 @@ ">\n" > -fe3c3b06de8042eddce90bc2cd23648498436c944492e72b7d3c233ab963107b +0a9bea9d50d95a2f319eba8fca1e3ffda3b8bb1d8461424c2e3c222f7022fc9e
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.