diff for duplicates of <1405348412-7352-5-git-send-email-lee.jones@linaro.org>
diff --git a/a/1.txt b/N1/1.txt
index dd8073f..f29e093 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -2,8 +2,8 @@ All the infrastructure is now in place for ST's PWM controller. This
patch takes the final step and enables the IP on the 2020 Rev-E
development platform.
-Signed-off-by: Ajit Pal Singh <ajitpal.singh@st.com>
-Signed-off-by: Lee Jones <lee.jones@linaro.org>
+Signed-off-by: Ajit Pal Singh <ajitpal.singh-qxv4g6HH51o@public.gmane.org>
+Signed-off-by: Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
---
arch/arm/boot/dts/stih416-b2020e.dts | 10 ++++++++++
1 file changed, 10 insertions(+)
@@ -29,4 +29,9 @@ index ba0fa2c..07cbf5b 100644
};
};
--
-1.8.3.2
\ No newline at end of file
+1.8.3.2
+
+--
+To unsubscribe from this list: send the line "unsubscribe devicetree" in
+the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
+More majordomo info at http://vger.kernel.org/majordomo-info.html
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 2f1a05b..ec5c621 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,10 @@
"ref\0001405348412-7352-1-git-send-email-lee.jones\@linaro.org\0"
]
[
- "From\0Lee Jones <lee.jones\@linaro.org>\0"
+ "ref\0001405348412-7352-1-git-send-email-lee.jones-QSEj5FYQhm4dnm+yROfE0A\@public.gmane.org\0"
+]
+[
+ "From\0Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A\@public.gmane.org>\0"
]
[
"Subject\0[PATCH v2 04/11] ARM: stih416-b2020e: Enable PWM on the B2020 Rev-E\0"
@@ -11,16 +14,16 @@
"Date\0Mon, 14 Jul 2014 15:33:25 +0100\0"
]
[
- "To\0linux-arm-kernel\@lists.infradead.org",
- " linux-kernel\@vger.kernel.org\0"
+ "To\0linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r\@public.gmane.org",
+ " linux-kernel-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org\0"
]
[
- "Cc\0lee.jones\@linaro.org",
- " kernel\@stlinux.com",
- " thierry.reding\@gmail.com",
- " linux-pwm\@vger.kernel.org",
- " devicetree\@vger.kernel.org",
- " ajitpal.singh\@st.com\0"
+ "Cc\0lee.jones-QSEj5FYQhm4dnm+yROfE0A\@public.gmane.org",
+ " kernel-F5mvAk5X5gdBDgjK7y7TUQ\@public.gmane.org",
+ " thierry.reding-Re5JQEeQqe8AvxtiuMwx3w\@public.gmane.org",
+ " linux-pwm-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+ " devicetree-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+ " ajitpal.singh-qxv4g6HH51o\@public.gmane.org\0"
]
[
"\0000:1\0"
@@ -33,8 +36,8 @@
"patch takes the final step and enables the IP on the 2020 Rev-E\n",
"development platform.\n",
"\n",
- "Signed-off-by: Ajit Pal Singh <ajitpal.singh\@st.com>\n",
- "Signed-off-by: Lee Jones <lee.jones\@linaro.org>\n",
+ "Signed-off-by: Ajit Pal Singh <ajitpal.singh-qxv4g6HH51o\@public.gmane.org>\n",
+ "Signed-off-by: Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A\@public.gmane.org>\n",
"---\n",
" arch/arm/boot/dts/stih416-b2020e.dts | 10 ++++++++++\n",
" 1 file changed, 10 insertions(+)\n",
@@ -60,7 +63,12 @@
" \t};\n",
" };\n",
"-- \n",
- "1.8.3.2"
+ "1.8.3.2\n",
+ "\n",
+ "--\n",
+ "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n",
+ "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org\n",
+ "More majordomo info at http://vger.kernel.org/majordomo-info.html"
]
-002662da62fb27acc1f78022aa56b96ae2d72d9e326265c4ef6d9d1d578b3c7f
+4448f9afd330dca9ef9388f191c1f6047712a63f67279abc6dd65fb1b44dd390
diff --git a/a/1.txt b/N2/1.txt
index dd8073f..4df22e8 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -13,17 +13,17 @@ index ba0fa2c..07cbf5b 100644
--- a/arch/arm/boot/dts/stih416-b2020e.dts
+++ b/arch/arm/boot/dts/stih416-b2020e.dts
@@ -31,5 +31,15 @@
- ethernet1: dwmac@fef08000 {
+ ethernet1: dwmac at fef08000 {
snps,reset-gpio = <&PIO0 7>;
};
+
+ /* SAS PWM Module */
-+ pwm0: pwm@fed10000 {
++ pwm0: pwm at fed10000 {
+ status = "okay";
+ };
+
+ /* SBC PWM Module */
-+ pwm1: pwm@fe510000 {
++ pwm1: pwm at fe510000 {
+ status = "okay";
+ };
};
diff --git a/a/content_digest b/N2/content_digest
index 2f1a05b..74ae153 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -2,7 +2,7 @@
"ref\0001405348412-7352-1-git-send-email-lee.jones\@linaro.org\0"
]
[
- "From\0Lee Jones <lee.jones\@linaro.org>\0"
+ "From\0lee.jones\@linaro.org (Lee Jones)\0"
]
[
"Subject\0[PATCH v2 04/11] ARM: stih416-b2020e: Enable PWM on the B2020 Rev-E\0"
@@ -11,16 +11,7 @@
"Date\0Mon, 14 Jul 2014 15:33:25 +0100\0"
]
[
- "To\0linux-arm-kernel\@lists.infradead.org",
- " linux-kernel\@vger.kernel.org\0"
-]
-[
- "Cc\0lee.jones\@linaro.org",
- " kernel\@stlinux.com",
- " thierry.reding\@gmail.com",
- " linux-pwm\@vger.kernel.org",
- " devicetree\@vger.kernel.org",
- " ajitpal.singh\@st.com\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -44,17 +35,17 @@
"--- a/arch/arm/boot/dts/stih416-b2020e.dts\n",
"+++ b/arch/arm/boot/dts/stih416-b2020e.dts\n",
"\@\@ -31,5 +31,15 \@\@\n",
- " \t\tethernet1: dwmac\@fef08000 {\n",
+ " \t\tethernet1: dwmac at fef08000 {\n",
" \t\t\tsnps,reset-gpio = <&PIO0 7>;\n",
" \t\t};\n",
"+\n",
"+\t\t/* SAS PWM Module */\n",
- "+\t\tpwm0: pwm\@fed10000 {\n",
+ "+\t\tpwm0: pwm at fed10000 {\n",
"+\t\t\tstatus\t\t= \"okay\";\n",
"+\t\t};\n",
"+\n",
"+\t\t/* SBC PWM Module */\n",
- "+\t\tpwm1: pwm\@fe510000 {\n",
+ "+\t\tpwm1: pwm at fe510000 {\n",
"+\t\t\tstatus\t\t= \"okay\";\n",
"+\t\t};\n",
" \t};\n",
@@ -63,4 +54,4 @@
"1.8.3.2"
]
-002662da62fb27acc1f78022aa56b96ae2d72d9e326265c4ef6d9d1d578b3c7f
+22be570c36c4b7bfaff24af93ce1b707075084ec8bb0b7b0e798e155651c2838
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.