diff for duplicates of <20160221111759.GA5387@panicking> diff --git a/a/1.txt b/N1/1.txt index 924859d..df7a526 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -27,7 +27,7 @@ index 99b6465..f7b852e 100644 status = "disabled"; }; + -+ flexcan1: can at 02090000 { ++ flexcan1: can@02090000 { + compatible = "fsl,imx6ul-flexcan", "fsl,imx6q-flexcan"; + reg = <0x02090000 0x4000>; + interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>; @@ -37,7 +37,7 @@ index 99b6465..f7b852e 100644 + status = "disabled"; + }; + -+ flexcan2: can at 02094000 { ++ flexcan2: can@02094000 { + compatible = "fsl,imx6ul-flexcan", "fsl,imx6q-flexcan"; + reg = <0x02094000 0x4000>; + interrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>; @@ -48,7 +48,7 @@ index 99b6465..f7b852e 100644 + }; }; - gpt1: gpt at 02098000 { + gpt1: gpt@02098000 { -- 2.7.0 diff --git a/a/content_digest b/N1/content_digest index dfc39da..3fde04b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,10 +3,16 @@ "ref\0CAOMZO5Bk_ZMhYzFLRFNK2TQvK4KHuj62AM_6uF-m-P1kJupTHQ@mail.gmail.com\0" "ref\020160220171816.GA24064@panicking\0" "ref\0CAOMZO5DfKi5KymQ6p9yF4ntqEJ7O=EEE7CKFmS-0N2XL8=ET7A@mail.gmail.com\0" - "From\0michael@amarulasolutions.com (Michael Trimarchi)\0" + "From\0Michael Trimarchi <michael@amarulasolutions.com>\0" "Subject\0[PATCH V2 1/4] ARM: dts: imx6ul: Add flexcan1 and flexcan2 support\0" "Date\0Sun, 21 Feb 2016 12:18:03 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Fabio Estevam <festevam@gmail.com>\0" + "Cc\0Fabio Estevam <fabio.estevam@freescale.com>" + devicetree@vger.kernel.org <devicetree@vger.kernel.org> + Sascha Hauer <kernel@pengutronix.de> + Brian Norris <computersforpeace@gmail.com> + Shawn Guo <shawnguo@kernel.org> + " linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>\0" "\00:1\0" "b\0" "Add support for FLEXCAN1 and FLEXCAN2.\n" @@ -38,7 +44,7 @@ " \t\t\t\t\tstatus = \"disabled\";\n" " \t\t\t\t};\n" "+\n" - "+\t\t\t\tflexcan1: can at 02090000 {\n" + "+\t\t\t\tflexcan1: can@02090000 {\n" "+\t\t\t\t\tcompatible = \"fsl,imx6ul-flexcan\", \"fsl,imx6q-flexcan\";\n" "+\t\t\t\t\treg = <0x02090000 0x4000>;\n" "+\t\t\t\t\tinterrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -48,7 +54,7 @@ "+\t\t\t\t\tstatus = \"disabled\";\n" "+\t\t\t\t};\n" "+\n" - "+\t\t\t\tflexcan2: can at 02094000 {\n" + "+\t\t\t\tflexcan2: can@02094000 {\n" "+\t\t\t\t\tcompatible = \"fsl,imx6ul-flexcan\", \"fsl,imx6q-flexcan\";\n" "+\t\t\t\t\treg = <0x02094000 0x4000>;\n" "+\t\t\t\t\tinterrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -59,7 +65,7 @@ "+\t\t\t\t};\n" " \t\t\t};\n" " \n" - " \t\t\tgpt1: gpt at 02098000 {\n" + " \t\t\tgpt1: gpt@02098000 {\n" "-- \n" "2.7.0\n" "\n" @@ -69,4 +75,4 @@ "| +31(0)851119172 Amsterdam 1018 AM NL |\n" | [`as] http://www.amarulasolutions.com | -2f6065bf25c0d6eee646b21fa4dbcf6dc52f75124460e0757ea475b649fa9980 +aad8a3ea0ae89736974f02c33aa7411b7da5bae938a29da0f3036cdeda572007
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.