diff for duplicates of <1417087253-12306-4-git-send-email-k.kozlowski@samsung.com>
diff --git a/a/content_digest b/N1/content_digest
index 2244867..2a7cc44 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -18,13 +18,13 @@
" devicetree\@vger.kernel.org\0"
]
[
- "Cc\0linux-samsung-soc\@vger.kernel.org",
- " linux-arm-kernel\@lists.infradead.org",
- " Kukjin Kim <kgene\@kernel.org>",
- " Kyungmin Park <kyungmin.park\@samsung.com>",
- " Marek Szyprowski <m.szyprowski\@samsung.com>",
+ "Cc\0Krzysztof Kozlowski <k.kozlowski\@samsung.com>",
+ " linux-samsung-soc\@vger.kernel.org",
" Bartlomiej Zolnierkiewicz <b.zolnierkie\@samsung.com>",
- " Krzysztof Kozlowski <k.kozlowski\@samsung.com>\0"
+ " Kyungmin Park <kyungmin.park\@samsung.com>",
+ " Kukjin Kim <kgene\@kernel.org>",
+ " linux-arm-kernel\@lists.infradead.org",
+ " Marek Szyprowski <m.szyprowski\@samsung.com>\0"
]
[
"\0000:1\0"
@@ -124,4 +124,4 @@
"1.9.1"
]
-6871b5c186009af188da5385e4d4fba0c00283fe7f71e4b1ef7ee5af57bc4232
+86f7bc7105ebdb57956963b46a76dd6d1c99220ea20bb38322006c10e7ef5e30
diff --git a/a/1.txt b/N2/1.txt
index d2aabf0..adc4add 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -61,7 +61,7 @@ index 0b08d05d470b..2faf2b3b71e7 100644
@@ -95,6 +95,13 @@ struct regulator_state {
* mode.
* @initial_state: Suspend state to set by default.
- * @initial_mode: Mode to set at startup.
+ * @initial_mode: Mode to set@startup.
+ *
+ * @use_ena_gpio: True if ena_gpio is a valid GPIO to use for enable control.
+ * If false, all other ena_gpio* fields are ignored.
diff --git a/a/content_digest b/N2/content_digest
index 2244867..a7ea691 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -2,7 +2,7 @@
"ref\0001417087253-12306-1-git-send-email-k.kozlowski\@samsung.com\0"
]
[
- "From\0Krzysztof Kozlowski <k.kozlowski\@samsung.com>\0"
+ "From\0k.kozlowski\@samsung.com (Krzysztof Kozlowski)\0"
]
[
"Subject\0[PATCH v4 3/7] regulator: of: Parse ena-gpios property from DTS\0"
@@ -11,20 +11,7 @@
"Date\0Thu, 27 Nov 2014 12:20:49 +0100\0"
]
[
- "To\0Lee Jones <lee.jones\@linaro.org>",
- " Liam Girdwood <lgirdwood\@gmail.com>",
- " Mark Brown <broonie\@kernel.org>",
- " linux-kernel\@vger.kernel.org",
- " devicetree\@vger.kernel.org\0"
-]
-[
- "Cc\0linux-samsung-soc\@vger.kernel.org",
- " linux-arm-kernel\@lists.infradead.org",
- " Kukjin Kim <kgene\@kernel.org>",
- " Kyungmin Park <kyungmin.park\@samsung.com>",
- " Marek Szyprowski <m.szyprowski\@samsung.com>",
- " Bartlomiej Zolnierkiewicz <b.zolnierkie\@samsung.com>",
- " Krzysztof Kozlowski <k.kozlowski\@samsung.com>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -96,7 +83,7 @@
"\@\@ -95,6 +95,13 \@\@ struct regulator_state {\n",
" * mode.\n",
" * \@initial_state: Suspend state to set by default.\n",
- " * \@initial_mode: Mode to set at startup.\n",
+ " * \@initial_mode: Mode to set\@startup.\n",
"+ *\n",
"+ * \@use_ena_gpio: True if ena_gpio is a valid GPIO to use for enable control.\n",
"+ * If false, all other ena_gpio* fields are ignored.\n",
@@ -124,4 +111,4 @@
"1.9.1"
]
-6871b5c186009af188da5385e4d4fba0c00283fe7f71e4b1ef7ee5af57bc4232
+fd49cc877487537de5c15450c69a14bbc23a147ba064cb024cd411dd5edcc13d
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.