diff for duplicates of <1405348412-7352-4-git-send-email-lee.jones@linaro.org>
diff --git a/a/1.txt b/N1/1.txt
index 038d612..fc081af 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -3,8 +3,8 @@ The Pinctrl configuration has already been applied, so the only
missing piece of the DT puzzle is for a board's DTB to enable
the nodes.
-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.dtsi | 44 +++++++++++++++++++++++++++++++++++++++++-
1 file changed, 43 insertions(+), 1 deletion(-)
@@ -71,4 +71,9 @@ index 84758d7..c28ef85 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 d78cab9..8007318 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 03/11] ARM: stih416: Add DT nodes for PWM\0"
@@ -11,16 +14,16 @@
"Date\0Mon, 14 Jul 2014 15:33:24 +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"
@@ -34,8 +37,8 @@
"missing piece of the DT puzzle is for a board's DTB to enable\n",
"the nodes.\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.dtsi | 44 +++++++++++++++++++++++++++++++++++++++++-\n",
" 1 file changed, 43 insertions(+), 1 deletion(-)\n",
@@ -102,7 +105,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"
]
-ba3ce5eeb0e80d0b832ca6c4307de5e4c0817fe4892e34321fa25646a9f5502a
+ff90ca695c604659e386304addee216c95fa2c5acaa4dced4aee31b8a77013b9
diff --git a/a/1.txt b/N2/1.txt
index 038d612..7c1d236 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -21,14 +21,14 @@ index 84758d7..c28ef85 100644
+ clocks = <&clk_sysin>;
};
- i2c@fed40000 {
+ i2c at fed40000 {
@@ -236,5 +236,47 @@
resets = <&powerdown STIH416_KEYSCAN_POWERDOWN>,
<&softreset STIH416_KEYSCAN_SOFTRESET>;
};
+
+ /* SAS PWM Module */
-+ pwm0: pwm@fed10000 {
++ pwm0: pwm at fed10000 {
+ compatible = "st,sti-pwm";
+ status = "disabled";
+ #pwm-cells = <2>;
@@ -46,7 +46,7 @@ index 84758d7..c28ef85 100644
+ };
+
+ /* SBC PWM Module */
-+ pwm1: pwm@fe510000 {
++ pwm1: pwm at fe510000 {
+ compatible = "st,sti-pwm";
+ status = "disabled";
+ #pwm-cells = <2>;
diff --git a/a/content_digest b/N2/content_digest
index d78cab9..8e42a19 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 03/11] ARM: stih416: Add DT nodes for PWM\0"
@@ -11,16 +11,7 @@
"Date\0Mon, 14 Jul 2014 15:33:24 +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"
@@ -52,14 +43,14 @@
"+\t\t\tclocks\t\t= <&clk_sysin>;\n",
" \t\t};\n",
" \n",
- " \t\ti2c\@fed40000 {\n",
+ " \t\ti2c at fed40000 {\n",
"\@\@ -236,5 +236,47 \@\@\n",
" \t\t\tresets\t= <&powerdown STIH416_KEYSCAN_POWERDOWN>,\n",
" \t\t\t\t <&softreset STIH416_KEYSCAN_SOFTRESET>;\n",
" \t\t};\n",
"+\n",
"+\t\t/* SAS PWM Module */\n",
- "+\t\tpwm0: pwm\@fed10000 {\n",
+ "+\t\tpwm0: pwm at fed10000 {\n",
"+\t\t\tcompatible\t= \"st,sti-pwm\";\n",
"+\t\t\tstatus\t\t= \"disabled\";\n",
"+\t\t\t#pwm-cells\t= <2>;\n",
@@ -77,7 +68,7 @@
"+\t\t};\n",
"+\n",
"+\t\t/* SBC PWM Module */\n",
- "+\t\tpwm1: pwm\@fe510000 {\n",
+ "+\t\tpwm1: pwm at fe510000 {\n",
"+\t\t\tcompatible\t= \"st,sti-pwm\";\n",
"+\t\t\tstatus\t\t= \"disabled\";\n",
"+\t\t\t#pwm-cells\t= <2>;\n",
@@ -105,4 +96,4 @@
"1.8.3.2"
]
-ba3ce5eeb0e80d0b832ca6c4307de5e4c0817fe4892e34321fa25646a9f5502a
+0d4801610bb8320862f4eb5f06a4714f5d68cf0944567956abf5e718efe51026
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.