diff for duplicates of <20140618152656.GE15956@lee--X1> diff --git a/a/1.txt b/N1/1.txt index c89e1db..edae7de 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -17,7 +17,7 @@ index 4f9024f..e9766a4 100644 }; + + /* COMMS PWM Module */ -+ pwm0: pwm@9810000 { ++ pwm0: pwm at 9810000 { + compatible = "st,sti-pwm"; + status = "disabled"; + #pwm-cells = <2>; @@ -29,7 +29,7 @@ index 4f9024f..e9766a4 100644 + }; + + /* SBC PWM Module */ -+ pwm1: pwm@9510000 { ++ pwm1: pwm at 9510000 { + compatible = "st,sti-pwm"; + status = "disabled"; + #pwm-cells = <2>; diff --git a/a/content_digest b/N1/content_digest index 42f22d5..265ac32 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,17 +1,8 @@ "ref\01403103172-19856-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 1/7] ARM: stih407: Add DT nodes for for PWM\0" "Date\0Wed, 18 Jun 2014 16:26:56 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org" - " linux-kernel@vger.kernel.org\0" - "Cc\0kernel@stlinux.com" - thierry.reding@gmail.com - linux-pwm@vger.kernel.org - maxime.coquelin@st.com - patrice.chotard@st.com - srinivas.kandagatla@gmail.com - devicetree@vger.kernel.org - " ajitpal.singh@st.com\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "ARM: stih407: Add DT nodes for for PWM\n" @@ -33,7 +24,7 @@ " \t\t};\n" "+\n" "+\t\t/* COMMS PWM Module */\n" - "+\t\tpwm0: pwm@9810000 {\n" + "+\t\tpwm0: pwm at 9810000 {\n" "+\t\t\tcompatible\t= \"st,sti-pwm\";\n" "+\t\t\tstatus\t\t= \"disabled\";\n" "+\t\t\t#pwm-cells\t= <2>;\n" @@ -45,7 +36,7 @@ "+\t\t};\n" "+\n" "+\t\t/* SBC PWM Module */\n" - "+\t\tpwm1: pwm@9510000 {\n" + "+\t\tpwm1: pwm at 9510000 {\n" "+\t\t\tcompatible\t= \"st,sti-pwm\";\n" "+\t\t\tstatus\t\t= \"disabled\";\n" "+\t\t\t#pwm-cells\t= <2>;\n" @@ -61,4 +52,4 @@ " \t};\n" }; -57fb60b53e5e06e198d7b1bec6abd75cb08b360592620d0e25304b20b3da14b3 +cc9c1311288ff11f0c44b45bf9642d9e8a261f071548d02652b432cb32132fe0
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.