diff for duplicates of <54058A99.9010407@atmel.com> diff --git a/a/content_digest b/N1/content_digest index a6edf95..4379a09 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01402481682-9811-4-git-send-email-voice.shen@atmel.com\0" "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" "Subject\0Re: [PATCH v2 3/4] dts: atmel: at91sam9rl: switch ssc compatible string\0" - "Date\0Tue, 2 Sep 2014 11:15:05 +0200\0" + "Date\0Tue, 02 Sep 2014 09:15:05 +0000\0" "To\0Bo Shen <voice.shen@atmel.com>" " broonie@kernel.org\0" "Cc\0linux-sound@vger.kernel.org" @@ -57,4 +57,4 @@ "-- \n" Nicolas Ferre -de3491b9728abd0030ee845d7e56b05cdc32aa0688b450f84807e2d3f6c91a06 +1a0b850a17290a0c48c9b8cf956a3ccacb486805b5365adc49e2702f3fc5c2d7
diff --git a/a/1.txt b/N2/1.txt index 52b3947..3ee674e 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -23,7 +23,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > @@ -203,7 +203,7 @@ > }; > -> ssc0: ssc@fffc0000 { +> ssc0: ssc at fffc0000 { > - compatible = "atmel,at91rm9200-ssc"; > + compatible = "atmel,at91sam9rl-ssc"; > reg = <0xfffc0000 0x4000>; @@ -32,7 +32,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > @@ -212,7 +212,7 @@ > }; > -> ssc1: ssc@fffc4000 { +> ssc1: ssc at fffc4000 { > - compatible = "atmel,at91rm9200-ssc"; > + compatible = "atmel,at91sam9rl-ssc"; > reg = <0xfffc4000 0x4000>; diff --git a/a/content_digest b/N2/content_digest index a6edf95..e7dd47b 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,14 +1,9 @@ "ref\01402481682-9811-1-git-send-email-voice.shen@atmel.com\0" "ref\01402481682-9811-4-git-send-email-voice.shen@atmel.com\0" - "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" - "Subject\0Re: [PATCH v2 3/4] dts: atmel: at91sam9rl: switch ssc compatible string\0" + "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0" + "Subject\0[PATCH v2 3/4] dts: atmel: at91sam9rl: switch ssc compatible string\0" "Date\0Tue, 2 Sep 2014 11:15:05 +0200\0" - "To\0Bo Shen <voice.shen@atmel.com>" - " broonie@kernel.org\0" - "Cc\0linux-sound@vger.kernel.org" - alsa-devel@alsa-project.org - linux-arm-kernel@lists.infradead.org - " devicetree@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 11/06/2014 12:14, Bo Shen :\n" @@ -36,7 +31,7 @@ "> @@ -203,7 +203,7 @@\n" "> \t\t\t};\n" "> \n" - "> \t\t\tssc0: ssc@fffc0000 {\n" + "> \t\t\tssc0: ssc at fffc0000 {\n" "> -\t\t\t\tcompatible = \"atmel,at91rm9200-ssc\";\n" "> +\t\t\t\tcompatible = \"atmel,at91sam9rl-ssc\";\n" "> \t\t\t\treg = <0xfffc0000 0x4000>;\n" @@ -45,7 +40,7 @@ "> @@ -212,7 +212,7 @@\n" "> \t\t\t};\n" "> \n" - "> \t\t\tssc1: ssc@fffc4000 {\n" + "> \t\t\tssc1: ssc at fffc4000 {\n" "> -\t\t\t\tcompatible = \"atmel,at91rm9200-ssc\";\n" "> +\t\t\t\tcompatible = \"atmel,at91sam9rl-ssc\";\n" "> \t\t\t\treg = <0xfffc4000 0x4000>;\n" @@ -57,4 +52,4 @@ "-- \n" Nicolas Ferre -de3491b9728abd0030ee845d7e56b05cdc32aa0688b450f84807e2d3f6c91a06 +68838b26f7a43f24c51e993bd1fcbb8429c42bbc338969ba3065df24dec9b258
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.