diff for duplicates of <20161220225530.96699-2-code@mmayer.net> diff --git a/a/content_digest b/N1/content_digest index e7ee544..ba31d94 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -9,13 +9,13 @@ Viresh Kumar <viresh.kumar@linaro.org> Rafael J . Wysocki <rjw@rjwysocki.net> " Arnd Bergmann <arnd@arndb.de>\0" - "Cc\0Markus Mayer <mmayer@broadcom.com>" + "Cc\0Device Tree List <devicetree@vger.kernel.org>" + Power Management List <linux-pm@vger.kernel.org> + Linux Kernel Mailing List <linux-kernel@vger.kernel.org> Broadcom Kernel List <bcm-kernel-feedback-list@broadcom.com> + Markus Mayer <mmayer@broadcom.com> Linux Clock List <linux-clk@vger.kernel.org> - Power Management List <linux-pm@vger.kernel.org> - Device Tree List <devicetree@vger.kernel.org> - ARM Kernel List <linux-arm-kernel@lists.infradead.org> - " Linux Kernel Mailing List <linux-kernel@vger.kernel.org>\0" + " ARM Kernel List <linux-arm-kernel@lists.infradead.org>\0" "\00:1\0" "b\0" "From: Markus Mayer <mmayer@broadcom.com>\n" @@ -133,4 +133,4 @@ "-- \n" 2.7.4 -eea4fa16600eebe78e2d6ec865b3d0a58ea676011e28c5a30a2bbbee0fb88f6d +c3d2b087c4ce65df3bc6dfcc904d5e928de9fc0f3e69c092fd6ad4de03a114a2
diff --git a/a/1.txt b/N2/1.txt index ea52c4d..a131b6c 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -46,7 +46,7 @@ index 0000000..3bc99c5 + clock-frequency = <54000000>; + }; + -+ cpu_pdiv: cpu_pdiv@f04e0008 { ++ cpu_pdiv: cpu_pdiv at f04e0008 { + compatible = "divider-clock"; + #clock-cells = <0>; + reg = <0xf04e0008 0x4>; @@ -66,7 +66,7 @@ index 0000000..3bc99c5 + clock-names = "cpu_pdiv"; + }; + -+ cpu_mdiv_ch0: cpu_mdiv_ch0@f04e0000 { ++ cpu_mdiv_ch0: cpu_mdiv_ch0 at f04e0000 { + compatible = "divider-clock"; + #clock-cells = <0>; + reg = <0xf04e0000 0x4>; @@ -77,13 +77,13 @@ index 0000000..3bc99c5 + clock-names = "cpu_ndiv_int"; + }; + -+ cpupll: cpupll@0 { ++ cpupll: cpupll at 0 { + #clock-cells = <0>; + clock-frequency = <1503000000>; + compatible = "fixed-clock"; + }; + -+ cpuclkdiv: cpu-clk-div@0 { ++ cpuclkdiv: cpu-clk-div at 0 { + #clock-cells = <0>; + clock-names = "cpupll", + "cpu_mdiv_ch0", @@ -102,8 +102,8 @@ diff --git a/MAINTAINERS b/MAINTAINERS index f6eb97b..5473b31 100644 --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -2786,6 +2786,7 @@ M: bcm-kernel-feedback-list@broadcom.com - L: linux-pm@vger.kernel.org +@@ -2786,6 +2786,7 @@ M: bcm-kernel-feedback-list at broadcom.com + L: linux-pm at vger.kernel.org S: Maintained F: Documentation/devicetree/bindings/cpufreq/brcm,stb-avs-cpu-freq.txt +F: Documentation/devicetree/bindings/clock/brcm,brcmstb-cpu-clk-div.txt diff --git a/a/content_digest b/N2/content_digest index e7ee544..898059a 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,21 +1,8 @@ "ref\020161220225530.96699-1-code@mmayer.net\0" - "From\0Markus Mayer <code@mmayer.net>\0" + "From\0code@mmayer.net (Markus Mayer)\0" "Subject\0[PATCH v4 1/2] dt-bindings: brcm: clocks: add binding for brcmstb-cpu-clk-div\0" "Date\0Tue, 20 Dec 2016 14:55:29 -0800\0" - "To\0Michael Turquette <mturquette@baylibre.com>" - Stephen Boyd <sboyd@codeaurora.org> - Rob Herring <robh+dt@kernel.org> - Mark Rutland <mark.rutland@arm.com> - Viresh Kumar <viresh.kumar@linaro.org> - Rafael J . Wysocki <rjw@rjwysocki.net> - " Arnd Bergmann <arnd@arndb.de>\0" - "Cc\0Markus Mayer <mmayer@broadcom.com>" - Broadcom Kernel List <bcm-kernel-feedback-list@broadcom.com> - Linux Clock List <linux-clk@vger.kernel.org> - Power Management List <linux-pm@vger.kernel.org> - Device Tree List <devicetree@vger.kernel.org> - ARM Kernel List <linux-arm-kernel@lists.infradead.org> - " Linux Kernel Mailing List <linux-kernel@vger.kernel.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "From: Markus Mayer <mmayer@broadcom.com>\n" @@ -66,7 +53,7 @@ "+\t\tclock-frequency = <54000000>;\n" "+\t};\n" "+\n" - "+\tcpu_pdiv: cpu_pdiv@f04e0008 {\n" + "+\tcpu_pdiv: cpu_pdiv at f04e0008 {\n" "+\t\tcompatible = \"divider-clock\";\n" "+\t\t#clock-cells = <0>;\n" "+\t\treg = <0xf04e0008 0x4>;\n" @@ -86,7 +73,7 @@ "+\t\tclock-names = \"cpu_pdiv\";\n" "+\t};\n" "+\n" - "+\tcpu_mdiv_ch0: cpu_mdiv_ch0@f04e0000 {\n" + "+\tcpu_mdiv_ch0: cpu_mdiv_ch0 at f04e0000 {\n" "+\t\tcompatible = \"divider-clock\";\n" "+\t\t#clock-cells = <0>;\n" "+\t\treg = <0xf04e0000 0x4>;\n" @@ -97,13 +84,13 @@ "+\t\tclock-names = \"cpu_ndiv_int\";\n" "+\t};\n" "+\n" - "+\tcpupll: cpupll@0 {\n" + "+\tcpupll: cpupll at 0 {\n" "+\t\t#clock-cells = <0>;\n" "+\t\tclock-frequency = <1503000000>;\n" "+\t\tcompatible = \"fixed-clock\";\n" "+\t};\n" "+\n" - "+\tcpuclkdiv: cpu-clk-div@0 {\n" + "+\tcpuclkdiv: cpu-clk-div at 0 {\n" "+\t\t#clock-cells = <0>;\n" "+\t\tclock-names = \"cpupll\",\n" "+\t\t\t\"cpu_mdiv_ch0\",\n" @@ -122,8 +109,8 @@ "index f6eb97b..5473b31 100644\n" "--- a/MAINTAINERS\n" "+++ b/MAINTAINERS\n" - "@@ -2786,6 +2786,7 @@ M:\tbcm-kernel-feedback-list@broadcom.com\n" - " L:\tlinux-pm@vger.kernel.org\n" + "@@ -2786,6 +2786,7 @@ M:\tbcm-kernel-feedback-list at broadcom.com\n" + " L:\tlinux-pm at vger.kernel.org\n" " S:\tMaintained\n" " F:\tDocumentation/devicetree/bindings/cpufreq/brcm,stb-avs-cpu-freq.txt\n" "+F:\tDocumentation/devicetree/bindings/clock/brcm,brcmstb-cpu-clk-div.txt\n" @@ -133,4 +120,4 @@ "-- \n" 2.7.4 -eea4fa16600eebe78e2d6ec865b3d0a58ea676011e28c5a30a2bbbee0fb88f6d +115111dbd3b0d2d449f5b4c5ea9f1615b00ca039ca7b94ea2e4f2808604f2456
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.