diff for duplicates of <51CB02DD.4080409@atmel.com> diff --git a/a/1.txt b/N1/1.txt index f60f858..ec0d6c9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -17,7 +17,7 @@ Bye, > --- a/arch/arm/boot/dts/sama5d3.dtsi > +++ b/arch/arm/boot/dts/sama5d3.dtsi > @@@ -80,9 -76,17 +80,12 @@@ -> spi0: spi at f0004000 { +> spi0: spi@f0004000 { > #address-cells = <1>; > #size-cells = <0>; > - compatible = "atmel,at91sam9x5-spi"; @@ -36,7 +36,7 @@ Bye, > pinctrl-0 = <&pinctrl_spi0>; > status = "disabled"; > @@@ -203,9 -207,17 +206,12 @@@ -> spi1: spi at f8008000 { +> spi1: spi@f8008000 { > #address-cells = <1>; > #size-cells = <0>; > - compatible = "atmel,at91sam9x5-spi"; diff --git a/a/content_digest b/N1/content_digest index 44824e0..b641e5e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,14 @@ "ref\01372237377-20315-1-git-send-email-nicolas.ferre@atmel.com\0" "ref\0201306261657.05191.arnd@arndb.de\0" - "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0" - "Subject\0[GIT PULL] at91: Device Tree updates for 3.11 #3\0" + "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" + "Subject\0Re: [GIT PULL] at91: Device Tree updates for 3.11 #3\0" "Date\0Wed, 26 Jun 2013 17:03:57 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Arnd Bergmann <arnd@arndb.de>\0" + "Cc\0Olof Johansson <olof@lixom.net>" + Linux Kernel list <linux-kernel@vger.kernel.org> + linux-arm-kernel <linux-arm-kernel@lists.infradead.org> + Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + " Ludovic Desroches <ludovic.desroches@atmel.com>\0" "\00:1\0" "b\0" "On 26/06/2013 16:57, Arnd Bergmann :\n" @@ -25,7 +30,7 @@ "> --- a/arch/arm/boot/dts/sama5d3.dtsi\n" "> +++ b/arch/arm/boot/dts/sama5d3.dtsi\n" "> @@@ -80,9 -76,17 +80,12 @@@\n" - "> \t\t\tspi0: spi at f0004000 {\n" + "> \t\t\tspi0: spi@f0004000 {\n" "> \t\t\t\t#address-cells = <1>;\n" "> \t\t\t\t#size-cells = <0>;\n" "> - \t\t\t\tcompatible = \"atmel,at91sam9x5-spi\";\n" @@ -44,7 +49,7 @@ "> \t\t\t\tpinctrl-0 = <&pinctrl_spi0>;\n" "> \t\t\t\tstatus = \"disabled\";\n" "> @@@ -203,9 -207,17 +206,12 @@@\n" - "> \t\t\tspi1: spi at f8008000 {\n" + "> \t\t\tspi1: spi@f8008000 {\n" "> \t\t\t\t#address-cells = <1>;\n" "> \t\t\t\t#size-cells = <0>;\n" "> - \t\t\t\tcompatible = \"atmel,at91sam9x5-spi\";\n" @@ -70,4 +75,4 @@ "-- \n" Nicolas Ferre -44cbaf71b36b7708c31115c67d83bd33532c610f1d75518aad470ee09e7290f1 +506dabca57057b961da933e8feaef46a1c5b11763dd51c676f596d90770f166c
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.