diff for duplicates of <1374564028-11352-5-git-send-email-t-kristo@ti.com>
diff --git a/a/1.txt b/N1/1.txt
index 462700a..3f1029a 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -325,7 +325,7 @@ index 647f02f..cba892a 100644
+ * @clksel: for clksel clks, pointer to struct clksel for this clock
+ * @dpll_data: for DPLLs, pointer to struct dpll_data for this clock
+ * @clkdm_name: clockdomain name that this clock is contained in
-+ * @clkdm: pointer to struct clockdomain, resolved from @clkdm_name at runtime
++ * @clkdm: pointer to struct clockdomain, resolved from @clkdm_name@runtime
+ * @rate_offset: bitshift for rate selection bitfield (OMAP1 only)
+ * @src_offset: bitshift for source selection bitfield (OMAP1 only)
+ *
diff --git a/a/content_digest b/N1/content_digest
index bd4faa0..92e24b3 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
"ref\0001374564028-11352-1-git-send-email-t-kristo\@ti.com\0"
]
[
- "From\0Tero Kristo <t-kristo\@ti.com>\0"
+ "From\0t-kristo\@ti.com (Tero Kristo)\0"
]
[
"Subject\0[PATCHv4 04/33] CLK: omap: move part of the machine specific clock header contents to driver\0"
@@ -11,17 +11,7 @@
"Date\0Tue, 23 Jul 2013 10:19:59 +0300\0"
]
[
- "To\0linux-omap\@vger.kernel.org",
- " paul\@pwsan.com",
- " khilman\@linaro.org",
- " tony\@atomide.com",
- " mturquette\@linaro.org",
- " nm\@ti.com",
- " rnayak\@ti.com\0"
-]
-[
- "Cc\0linux-arm-kernel\@lists.infradead.org",
- " devicetree-discuss\@lists.ozlabs.org\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -357,7 +347,7 @@
"+ * \@clksel: for clksel clks, pointer to struct clksel for this clock\n",
"+ * \@dpll_data: for DPLLs, pointer to struct dpll_data for this clock\n",
"+ * \@clkdm_name: clockdomain name that this clock is contained in\n",
- "+ * \@clkdm: pointer to struct clockdomain, resolved from \@clkdm_name at runtime\n",
+ "+ * \@clkdm: pointer to struct clockdomain, resolved from \@clkdm_name\@runtime\n",
"+ * \@rate_offset: bitshift for rate selection bitfield (OMAP1 only)\n",
"+ * \@src_offset: bitshift for source selection bitfield (OMAP1 only)\n",
"+ *\n",
@@ -431,4 +421,4 @@
"1.7.9.5"
]
-1f8609558350db62a17b3fcc207b790954f8e18c520e1f936ef4c3469dc16dc4
+53c74a40735c365d94d9b82c40d9178dfd24567d84ed01f352dc11fba7674c43
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.