diff for duplicates of <5418C1D2.4000303@sonymobile.com> diff --git a/a/1.txt b/N1/1.txt index 9f2142a..a972c2a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -33,14 +33,14 @@ index 0000000..59b3fa1 + compatible = "qcom,msm8974"; + qcom,msm-id = <126 8 0>, <185 8 0>, <186 8 0>; + -+ memory@0 { ++ memory at 0 { + reg = <0 0x40000000>, <0x40000000 0x40000000>; + device_type = "memory"; + }; +}; + +&soc { -+ serial@f991e000 { ++ serial at f991e000 { + status = "ok"; + }; +}; diff --git a/a/content_digest b/N1/content_digest index b454da7..12373cb 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,13 +1,7 @@ - "From\0Tim Bird <tim.bird@sonymobile.com>\0" + "From\0tim.bird@sonymobile.com (Tim Bird)\0" "Subject\0[PATCH] ARM: dts: Add initial DTS file for Sony Xperia Z1 phone\0" "Date\0Tue, 16 Sep 2014 16:03:46 -0700\0" - "To\0galak@codeaurora.org\0" - "Cc\0linux-arm-msm@vger.kernel.org" - Bjorn Andersson <Bjorn.Andersson@sonymobile.com> - linux-kernel@vger.kernel.org - device-tree@vger.kernel.org - linux-arm-kernel@lists.infradead.org - " arnd.bergmann@linaro.org <arnd.bergmann@linaro.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "This DTS has initial support for just a serial console, for the\n" @@ -45,18 +39,18 @@ "+\tcompatible = \"qcom,msm8974\";\n" "+\tqcom,msm-id = <126 8 0>, <185 8 0>, <186 8 0>;\n" "+\n" - "+\tmemory@0 {\n" + "+\tmemory at 0 {\n" "+\t\treg = <0 0x40000000>, <0x40000000 0x40000000>;\n" "+\t\tdevice_type = \"memory\";\n" "+\t};\n" "+};\n" "+\n" "+&soc {\n" - "+\tserial@f991e000 {\n" + "+\tserial at f991e000 {\n" "+\t\tstatus = \"ok\";\n" "+\t};\n" "+};\n" "-- \n" 1.7.9.5 -67599cac43033e79c94b30f832faef0dc63196963ceb20b670d8b4ff2223eaf3 +d3c03ccf792548faf316f89133b5bf0faf75b3475f2110002b5f7b3c83e2e6b3
diff --git a/a/content_digest b/N2/content_digest index b454da7..7636e14 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,12 +1,12 @@ "From\0Tim Bird <tim.bird@sonymobile.com>\0" "Subject\0[PATCH] ARM: dts: Add initial DTS file for Sony Xperia Z1 phone\0" "Date\0Tue, 16 Sep 2014 16:03:46 -0700\0" - "To\0galak@codeaurora.org\0" - "Cc\0linux-arm-msm@vger.kernel.org" + "To\0<galak@codeaurora.org>\0" + "Cc\0<linux-arm-msm@vger.kernel.org>" Bjorn Andersson <Bjorn.Andersson@sonymobile.com> - linux-kernel@vger.kernel.org - device-tree@vger.kernel.org - linux-arm-kernel@lists.infradead.org + <linux-kernel@vger.kernel.org> + <device-tree@vger.kernel.org> + <linux-arm-kernel@lists.infradead.org> " arnd.bergmann@linaro.org <arnd.bergmann@linaro.org>\0" "\00:1\0" "b\0" @@ -59,4 +59,4 @@ "-- \n" 1.7.9.5 -67599cac43033e79c94b30f832faef0dc63196963ceb20b670d8b4ff2223eaf3 +abc40e7bf523fe7c034cea50e89d350e38464201377779a1159e8c26d5997d58
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.