diff for duplicates of <201306261657.05191.arnd@arndb.de> diff --git a/a/1.txt b/N1/1.txt index b83a9ab..894ae3b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -14,7 +14,7 @@ index bbf88d7,5956f9b..a1d5e25 --- 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"; @@ -33,7 +33,7 @@ index bbf88d7,5956f9b..a1d5e25 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 c624795..f1f3b74 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,13 @@ "ref\01372237377-20315-1-git-send-email-nicolas.ferre@atmel.com\0" - "From\0arnd@arndb.de (Arnd Bergmann)\0" - "Subject\0[GIT PULL] at91: Device Tree updates for 3.11 #3\0" + "From\0Arnd Bergmann <arnd@arndb.de>\0" + "Subject\0Re: [GIT PULL] at91: Device Tree updates for 3.11 #3\0" "Date\0Wed, 26 Jun 2013 16:57:04 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Nicolas Ferre <nicolas.ferre@atmel.com>\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 Wednesday 26 June 2013, Nicolas Ferre wrote:\n" @@ -21,7 +26,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" @@ -40,7 +45,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" @@ -59,4 +64,4 @@ " \t\t\t\tpinctrl-0 = <&pinctrl_spi1>;\n" " \t\t\t\tstatus = \"disabled\";" -95e25ee5dc73916b8cff47fbd7ea992be7d380be46bb365ee305ce1520a61936 +6dc76443ea62252147e3f3d31bbe903f315c0abc4488ee694c30fbf8023dbcd0
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.