diff for duplicates of <20150331074027.GH9447@x1> diff --git a/a/1.txt b/N1/1.txt index 956095f..6641018 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -53,7 +53,7 @@ merge conflicts during the v4.1 merge window. > >-#include <dt-bindings/phy/phy-miphy365x.h> > >+#include <dt-bindings/phy/phy.h> > > -> > sata0: sata at fe380000 { +> > sata0: sata@fe380000 { > > ... > >- phys = <&phy_port0 MIPHY_TYPE_SATA>; > >+ phys = <&phy_port0 PHY_TYPE_SATA>; @@ -159,5 +159,5 @@ merge conflicts during the v4.1 merge window. -- Lee Jones Linaro STMicroelectronics Landing Team Lead -Linaro.org ? Open source software for ARM SoCs +Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog diff --git a/a/content_digest b/N1/content_digest index f35a1ee..db8c819 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,19 @@ "ref\01427728632-10846-1-git-send-email-peter.griffin@linaro.org\0" "ref\01427728632-10846-2-git-send-email-peter.griffin@linaro.org\0" "ref\0551A2D4D.1010601@ti.com\0" - "From\0lee.jones@linaro.org (Lee Jones)\0" - "Subject\0[PATCH v2 1/6] phy: miphy365x: Use the generic phy type constants in dt-bindings/phy/phy.h\0" + "From\0Lee Jones <lee.jones@linaro.org>\0" + "Subject\0Re: [PATCH v2 1/6] phy: miphy365x: Use the generic phy type constants in dt-bindings/phy/phy.h\0" "Date\0Tue, 31 Mar 2015 08:40:27 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Kishon Vijay Abraham I <kishon@ti.com>\0" + "Cc\0Peter Griffin <peter.griffin@linaro.org>" + linux-arm-kernel@lists.infradead.org + linux-kernel@vger.kernel.org + srinivas.kandagatla@gmail.com + maxime.coquelin@st.com + patrice.chotard@st.com + balbi@ti.com + devicetree@vger.kernel.org + " robherring2@gmail.com\0" "\00:1\0" "b\0" "On Tue, 31 Mar 2015, Kishon Vijay Abraham I wrote:\n" @@ -62,7 +71,7 @@ "> >-#include <dt-bindings/phy/phy-miphy365x.h>\n" "> >+#include <dt-bindings/phy/phy.h>\n" "> >\n" - "> > \tsata0: sata at fe380000 {\n" + "> > \tsata0: sata@fe380000 {\n" "> > \t\t...\n" "> >-\t\tphys\t = <&phy_port0 MIPHY_TYPE_SATA>;\n" "> >+\t\tphys\t = <&phy_port0 PHY_TYPE_SATA>;\n" @@ -168,7 +177,7 @@ "-- \n" "Lee Jones\n" "Linaro STMicroelectronics Landing Team Lead\n" - "Linaro.org ? Open source software for ARM SoCs\n" + "Linaro.org \342\224\202 Open source software for ARM SoCs\n" Follow Linaro: Facebook | Twitter | Blog -6e87fd6d7d1d7b37d49a8ab2ab7b682bf93cd25488411c146c85ccd6408c8528 +586459b0bf54bc79ac3945a234ece81b62f97cb090e93d212dc49fec56340b9c
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.