diff for duplicates of <1490661656-10318-5-git-send-email-steve_longerbeam@mentor.com>
diff --git a/a/content_digest b/N1/content_digest
index f403284..c7d4f6c 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -41,12 +41,12 @@
" pavel\@ucw.cz\0"
]
[
- "Cc\0devicetree\@vger.kernel.org",
+ "Cc\0devel\@driverdev.osuosl.org",
+ " devicetree\@vger.kernel.org",
+ " Steve Longerbeam <steve_longerbeam\@mentor.com>",
" linux-kernel\@vger.kernel.org",
" linux-arm-kernel\@lists.infradead.org",
- " linux-media\@vger.kernel.org",
- " devel\@driverdev.osuosl.org",
- " Steve Longerbeam <steve_longerbeam\@mentor.com>\0"
+ " linux-media\@vger.kernel.org\0"
]
[
"\0000:1\0"
@@ -86,4 +86,4 @@
"2.7.4"
]
-c72e7c0f320fed47171bc18e31dce8f13fcf24fbe4fe1aa7e029636c508e0cbd
+fba6471300d17736c87b881ab302f6dfa216f241602680c4da82a4fb01c87c5c
diff --git a/a/1.txt b/N2/1.txt
index 254d2ff..39a9e50 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -13,7 +13,7 @@ index 6d7bf64..d28a413 100644
@@ -1134,7 +1134,14 @@
};
- mipi_csi: mipi@021dc000 {
+ mipi_csi: mipi at 021dc000 {
+ compatible = "fsl,imx6-mipi-csi2", "snps,dw-mipi-csi2";
reg = <0x021dc000 0x4000>;
+ interrupts = <0 100 0x04>, <0 101 0x04>;
@@ -24,6 +24,6 @@ index 6d7bf64..d28a413 100644
+ status = "disabled";
};
- mipi_dsi: mipi@021e0000 {
+ mipi_dsi: mipi at 021e0000 {
--
2.7.4
\ No newline at end of file
diff --git a/a/content_digest b/N2/content_digest
index f403284..64991f4 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -2,7 +2,7 @@
"ref\0001490661656-10318-1-git-send-email-steve_longerbeam\@mentor.com\0"
]
[
- "From\0Steve Longerbeam <slongerbeam\@gmail.com>\0"
+ "From\0slongerbeam\@gmail.com (Steve Longerbeam)\0"
]
[
"Subject\0[PATCH v6 04/39] ARM: dts: imx6qdl: Add compatible, clocks, irqs to MIPI CSI-2 node\0"
@@ -11,42 +11,7 @@
"Date\0Mon, 27 Mar 2017 17:40:21 -0700\0"
]
[
- "To\0robh+dt\@kernel.org",
- " mark.rutland\@arm.com",
- " shawnguo\@kernel.org",
- " kernel\@pengutronix.de",
- " fabio.estevam\@nxp.com",
- " linux\@armlinux.org.uk",
- " mchehab\@kernel.org",
- " hverkuil\@xs4all.nl",
- " nick\@shmanahar.org",
- " markus.heiser\@darmarit.de",
- " p.zabel\@pengutronix.de",
- " laurent.pinchart+renesas\@ideasonboard.com",
- " bparrot\@ti.com",
- " geert\@linux-m68k.org",
- " arnd\@arndb.de",
- " sudipm.mukherjee\@gmail.com",
- " minghsiu.tsai\@mediatek.com",
- " tiffany.lin\@mediatek.com",
- " jean-christophe.trotin\@st.com",
- " horms+renesas\@verge.net.au",
- " niklas.soderlund+renesas\@ragnatech.se",
- " robert.jarzmik\@free.fr",
- " songjun.wu\@microchip.com",
- " andrew-ct.chen\@mediatek.com",
- " gregkh\@linuxfoundation.org",
- " shuah\@kernel.org",
- " sakari.ailus\@linux.intel.com",
- " pavel\@ucw.cz\0"
-]
-[
- "Cc\0devicetree\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org",
- " linux-arm-kernel\@lists.infradead.org",
- " linux-media\@vger.kernel.org",
- " devel\@driverdev.osuosl.org",
- " Steve Longerbeam <steve_longerbeam\@mentor.com>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -70,7 +35,7 @@
"\@\@ -1134,7 +1134,14 \@\@\n",
" \t\t\t};\n",
" \n",
- " \t\t\tmipi_csi: mipi\@021dc000 {\n",
+ " \t\t\tmipi_csi: mipi at 021dc000 {\n",
"+\t\t\t\tcompatible = \"fsl,imx6-mipi-csi2\", \"snps,dw-mipi-csi2\";\n",
" \t\t\t\treg = <0x021dc000 0x4000>;\n",
"+\t\t\t\tinterrupts = <0 100 0x04>, <0 101 0x04>;\n",
@@ -81,9 +46,9 @@
"+\t\t\t\tstatus = \"disabled\";\n",
" \t\t\t};\n",
" \n",
- " \t\t\tmipi_dsi: mipi\@021e0000 {\n",
+ " \t\t\tmipi_dsi: mipi at 021e0000 {\n",
"-- \n",
"2.7.4"
]
-c72e7c0f320fed47171bc18e31dce8f13fcf24fbe4fe1aa7e029636c508e0cbd
+671993af02034b1154a8752bcb52be3a79315e21a416d0bd91ae33b4a83e4f9a
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.