diff for duplicates of <20170119002933.7529-2-code@mmayer.net> diff --git a/a/content_digest b/N1/content_digest index 9f74ed0..e8c7964 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" @@ -77,4 +77,4 @@ "-- \n" 2.7.4 -747ac1dcb1be7c1b3699b379a32acc562fc0a1b94f8c76e9bfb40cee31f52e06 +8a628055f0f7d0fbed64392c139d4a5e693ba22da5aec4b595b80fa64f26d0d9
diff --git a/a/1.txt b/N2/1.txt index 32386a5..5d8098b 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -33,7 +33,7 @@ index 0000000..c4acb53 +- clock-names: the clock may be named + +Example: -+ cpuclkdiv: cpu-clk-div@f03e257c { ++ cpuclkdiv: cpu-clk-div at f03e257c { + compatible = "brcm,brcmstb-cpu-clk-div"; + reg = <0xf03e257c 0x4>; + div-table = <0x00 1>; @@ -46,8 +46,8 @@ diff --git a/MAINTAINERS b/MAINTAINERS index cfff2c9..690761d 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 9f74ed0..0d7d866 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,21 +1,8 @@ "ref\020170119002933.7529-1-code@mmayer.net\0" - "From\0Markus Mayer <code@mmayer.net>\0" + "From\0code@mmayer.net (Markus Mayer)\0" "Subject\0[PATCH v5 1/2] dt-bindings: brcm: clocks: add binding for brcmstb-cpu-clk-div\0" "Date\0Wed, 18 Jan 2017 16:29:32 -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" @@ -53,7 +40,7 @@ "+- clock-names: the clock may be named\n" "+\n" "+Example:\n" - "+\tcpuclkdiv: cpu-clk-div@f03e257c {\n" + "+\tcpuclkdiv: cpu-clk-div at f03e257c {\n" "+\t\tcompatible = \"brcm,brcmstb-cpu-clk-div\";\n" "+\t\treg = <0xf03e257c 0x4>;\n" "+\t\tdiv-table = <0x00 1>;\n" @@ -66,8 +53,8 @@ "index cfff2c9..690761d 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" @@ -77,4 +64,4 @@ "-- \n" 2.7.4 -747ac1dcb1be7c1b3699b379a32acc562fc0a1b94f8c76e9bfb40cee31f52e06 +9d849b29a8af1db2f797dca9ff534f824cf6ac21cbea54a499d435c9b783b034
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.