diff for duplicates of <20170519081541.26753-35-kishon@ti.com> diff --git a/a/1.txt b/N1/1.txt index fba6d1e..8de5e51 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -15,7 +15,7 @@ index 38fb1828e26a..40b9eb96cdeb 100644 @@ -1035,7 +1035,7 @@ }; - mmc1: mmc@4809c000 { + mmc1: mmc at 4809c000 { - compatible = "ti,omap4-hsmmc"; + compatible = "ti,dra7-hsmmc", "ti,omap4-hsmmc"; reg = <0x4809c000 0x400>; @@ -24,7 +24,7 @@ index 38fb1828e26a..40b9eb96cdeb 100644 @@ -1049,7 +1049,7 @@ }; - mmc2: mmc@480b4000 { + mmc2: mmc at 480b4000 { - compatible = "ti,omap4-hsmmc"; + compatible = "ti,dra7-hsmmc", "ti,omap4-hsmmc"; reg = <0x480b4000 0x400>; @@ -33,7 +33,7 @@ index 38fb1828e26a..40b9eb96cdeb 100644 @@ -1061,7 +1061,7 @@ }; - mmc3: mmc@480ad000 { + mmc3: mmc at 480ad000 { - compatible = "ti,omap4-hsmmc"; + compatible = "ti,dra7-hsmmc", "ti,omap4-hsmmc"; reg = <0x480ad000 0x400>; @@ -42,7 +42,7 @@ index 38fb1828e26a..40b9eb96cdeb 100644 @@ -1074,7 +1074,7 @@ }; - mmc4: mmc@480d1000 { + mmc4: mmc at 480d1000 { - compatible = "ti,omap4-hsmmc"; + compatible = "ti,dra7-hsmmc", "ti,omap4-hsmmc"; reg = <0x480d1000 0x400>; diff --git a/a/content_digest b/N1/content_digest index 34bf8e2..2522722 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,21 +1,8 @@ "ref\020170519081541.26753-1-kishon@ti.com\0" - "From\0Kishon Vijay Abraham I <kishon@ti.com>\0" + "From\0kishon@ti.com (Kishon Vijay Abraham I)\0" "Subject\0[PATCH 34/41] ARM: dts: dra7: Use new dra7-specific compatible string\0" "Date\0Fri, 19 May 2017 13:45:34 +0530\0" - "To\0Ulf Hansson <ulf.hansson@linaro.org>" - Rob Herring <robh+dt@kernel.org> - " Tony Lindgren <tony@atomide.com>\0" - "Cc\0linux-doc@vger.kernel.org" - linux-kernel@vger.kernel.org - linux-mmc@vger.kernel.org - devicetree@vger.kernel.org - linux-omap@vger.kernel.org - linux-arm-kernel@lists.infradead.org - Jonathan Corbet <corbet@lwn.net> - Mark Rutland <mark.rutland@arm.com> - Russell King <linux@armlinux.org.uk> - nsekhar@ti.com - " kishon@ti.com\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Use the new compatible string \"ti,dra7-hsmmc\" that was specifically\n" @@ -35,7 +22,7 @@ "@@ -1035,7 +1035,7 @@\n" " \t\t};\n" " \n" - " \t\tmmc1: mmc@4809c000 {\n" + " \t\tmmc1: mmc at 4809c000 {\n" "-\t\t\tcompatible = \"ti,omap4-hsmmc\";\n" "+\t\t\tcompatible = \"ti,dra7-hsmmc\", \"ti,omap4-hsmmc\";\n" " \t\t\treg = <0x4809c000 0x400>;\n" @@ -44,7 +31,7 @@ "@@ -1049,7 +1049,7 @@\n" " \t\t};\n" " \n" - " \t\tmmc2: mmc@480b4000 {\n" + " \t\tmmc2: mmc at 480b4000 {\n" "-\t\t\tcompatible = \"ti,omap4-hsmmc\";\n" "+\t\t\tcompatible = \"ti,dra7-hsmmc\", \"ti,omap4-hsmmc\";\n" " \t\t\treg = <0x480b4000 0x400>;\n" @@ -53,7 +40,7 @@ "@@ -1061,7 +1061,7 @@\n" " \t\t};\n" " \n" - " \t\tmmc3: mmc@480ad000 {\n" + " \t\tmmc3: mmc at 480ad000 {\n" "-\t\t\tcompatible = \"ti,omap4-hsmmc\";\n" "+\t\t\tcompatible = \"ti,dra7-hsmmc\", \"ti,omap4-hsmmc\";\n" " \t\t\treg = <0x480ad000 0x400>;\n" @@ -62,7 +49,7 @@ "@@ -1074,7 +1074,7 @@\n" " \t\t};\n" " \n" - " \t\tmmc4: mmc@480d1000 {\n" + " \t\tmmc4: mmc at 480d1000 {\n" "-\t\t\tcompatible = \"ti,omap4-hsmmc\";\n" "+\t\t\tcompatible = \"ti,dra7-hsmmc\", \"ti,omap4-hsmmc\";\n" " \t\t\treg = <0x480d1000 0x400>;\n" @@ -71,4 +58,4 @@ "-- \n" 2.11.0 -a2d8330d8b67215b33d92c29342eab5373c2858ca99584ecf8b90c3d1c6b3eba +761cd0166a04baf57b3e0d281338cae9723a916af22fe802923ab9b61758bb52
diff --git a/a/content_digest b/N2/content_digest index 34bf8e2..b286a32 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -5,17 +5,17 @@ "To\0Ulf Hansson <ulf.hansson@linaro.org>" Rob Herring <robh+dt@kernel.org> " Tony Lindgren <tony@atomide.com>\0" - "Cc\0linux-doc@vger.kernel.org" - linux-kernel@vger.kernel.org - linux-mmc@vger.kernel.org - devicetree@vger.kernel.org - linux-omap@vger.kernel.org - linux-arm-kernel@lists.infradead.org + "Cc\0<linux-doc@vger.kernel.org>" + <linux-kernel@vger.kernel.org> + <linux-mmc@vger.kernel.org> + <devicetree@vger.kernel.org> + <linux-omap@vger.kernel.org> + <linux-arm-kernel@lists.infradead.org> Jonathan Corbet <corbet@lwn.net> Mark Rutland <mark.rutland@arm.com> Russell King <linux@armlinux.org.uk> - nsekhar@ti.com - " kishon@ti.com\0" + <nsekhar@ti.com> + " <kishon@ti.com>\0" "\00:1\0" "b\0" "Use the new compatible string \"ti,dra7-hsmmc\" that was specifically\n" @@ -71,4 +71,4 @@ "-- \n" 2.11.0 -a2d8330d8b67215b33d92c29342eab5373c2858ca99584ecf8b90c3d1c6b3eba +0f665dcf4e6215cee4b0ee61222d6aff079f3311781b4f7caa575c8a30a18bf5
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.