diff for duplicates of <54058A77.3090603@atmel.com> diff --git a/a/content_digest b/N1/content_digest index dcab4e6..b9efdb4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01402481682-9811-5-git-send-email-voice.shen@atmel.com\0" "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" "Subject\0Re: [PATCH v2 4/4] dts: atmel: at91sam9g20: switch ssc compatible string\0" - "Date\0Tue, 2 Sep 2014 11:14:31 +0200\0" + "Date\0Tue, 02 Sep 2014 09:14:31 +0000\0" "To\0Bo Shen <voice.shen@atmel.com>" " broonie@kernel.org\0" "Cc\0linux-sound@vger.kernel.org" @@ -51,4 +51,4 @@ "-- \n" Nicolas Ferre -04988fb26bdcb62ba02fda9499b9ed112c6d6d73e509c5398fcb605b8caad2eb +3d4dfb158c43cfdbb22df6921a69c2e162bc2063200706d2694ee6d77720e1fa
diff --git a/a/1.txt b/N2/1.txt index ba34348..3eda280 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -25,11 +25,11 @@ Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > compatible = "atmel,at91sam9g20-i2c"; > }; > -> + ssc0: ssc@fffbc000 { +> + ssc0: ssc at fffbc000 { > + compatible = "atmel,at91sam9rl-ssc"; > + }; > + -> adc0: adc@fffe0000 { +> adc0: adc at fffe0000 { > atmel,adc-startup-time = <40>; > }; > diff --git a/a/content_digest b/N2/content_digest index dcab4e6..eb36efb 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-5-git-send-email-voice.shen@atmel.com\0" - "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" - "Subject\0Re: [PATCH v2 4/4] dts: atmel: at91sam9g20: switch ssc compatible string\0" + "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0" + "Subject\0[PATCH v2 4/4] dts: atmel: at91sam9g20: switch ssc compatible string\0" "Date\0Tue, 2 Sep 2014 11:14:31 +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" @@ -38,11 +33,11 @@ "> \t\t\t\tcompatible = \"atmel,at91sam9g20-i2c\";\n" "> \t\t\t};\n" "> \n" - "> +\t\t\tssc0: ssc@fffbc000 {\n" + "> +\t\t\tssc0: ssc at fffbc000 {\n" "> +\t\t\t\tcompatible = \"atmel,at91sam9rl-ssc\";\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tadc0: adc@fffe0000 {\n" + "> \t\t\tadc0: adc at fffe0000 {\n" "> \t\t\t\tatmel,adc-startup-time = <40>;\n" "> \t\t\t};\n" "> \n" @@ -51,4 +46,4 @@ "-- \n" Nicolas Ferre -04988fb26bdcb62ba02fda9499b9ed112c6d6d73e509c5398fcb605b8caad2eb +e3b863750ca34607d710d96220d4a67d5416026d303496d4ab7553fce5f66b14
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.