diff for duplicates of <20110126044416.16410.68942.stgit@localhost6.localdomain6> diff --git a/a/1.txt b/N1/1.txt index 2de28a3..c0bd79c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -8,7 +8,7 @@ called when a device references the provider's OF node for a clock reference. Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com> -[grant.likely at secretlab.ca: fix Kconfig conflict] +[grant.likely@secretlab.ca: fix Kconfig conflict] Signed-off-by: Grant Likely <grant.likely@secretlab.ca> --- drivers/of/Kconfig | 5 ++ diff --git a/a/content_digest b/N1/content_digest index 9f5f108..d301967 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,12 @@ "ref\020110126043338.16410.75019.stgit@localhost6.localdomain6\0" - "From\0grant.likely@secretlab.ca (Grant Likely)\0" + "From\0Grant Likely <grant.likely@secretlab.ca>\0" "Subject\0[RFC PATCH 3/5] of: add clock providers\0" "Date\0Tue, 25 Jan 2011 21:44:17 -0700\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0devicetree-discuss@lists.ozlabs.org" + jeremy.kerr@canonical.com + linux-kernel@vger.kernel.org + " linux-arm-kernel@lists.infradead.org\0" + "Cc\0nicolas.pitre@linaro.org\0" "\00:1\0" "b\0" "From: Jeremy Kerr <jeremy.kerr@canonical.com>\n" @@ -15,7 +19,7 @@ "reference.\n" "\n" "Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com>\n" - "[grant.likely at secretlab.ca: fix Kconfig conflict]\n" + "[grant.likely@secretlab.ca: fix Kconfig conflict]\n" "Signed-off-by: Grant Likely <grant.likely@secretlab.ca>\n" "---\n" " drivers/of/Kconfig | 5 ++\n" @@ -235,4 +239,4 @@ "+#endif /* __OF_CLK_H */\n" + -b4df8cbc54c6198d6bc53867d87d025c4a30e2fc68951fe9b133dcb7cdfc13d5 +9db528705d68865b542c998121c89d50c6956e486a99de4a5ebb8b8c8ef3ce66
diff --git a/a/1.txt b/N2/1.txt index 2de28a3..298057e 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,4 +1,4 @@ -From: Jeremy Kerr <jeremy.kerr@canonical.com> +From: Jeremy Kerr <jeremy.kerr-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org> Based on work by Ben Herrenschmidt, this patch adds an of_clk_get function to allow platforms to retrieve clock data from the device tree. @@ -7,9 +7,9 @@ Platform register a provider through of_clk_add_provider, which will be called when a device references the provider's OF node for a clock reference. -Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com> -[grant.likely at secretlab.ca: fix Kconfig conflict] -Signed-off-by: Grant Likely <grant.likely@secretlab.ca> +Signed-off-by: Jeremy Kerr <jeremy.kerr-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org> +[grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org: fix Kconfig conflict] +Signed-off-by: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org> --- drivers/of/Kconfig | 5 ++ drivers/of/Makefile | 1 diff --git a/a/content_digest b/N2/content_digest index 9f5f108..462a8c5 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,11 +1,16 @@ "ref\020110126043338.16410.75019.stgit@localhost6.localdomain6\0" - "From\0grant.likely@secretlab.ca (Grant Likely)\0" + "ref\020110126043338.16410.75019.stgit-bi+AKbBUZKagILUCTcTcHdKyNwTtLsGr@public.gmane.org\0" + "From\0Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>\0" "Subject\0[RFC PATCH 3/5] of: add clock providers\0" "Date\0Tue, 25 Jan 2011 21:44:17 -0700\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org" + jeremy.kerr-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0" + "Cc\0nicolas.pitre-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org\0" "\00:1\0" "b\0" - "From: Jeremy Kerr <jeremy.kerr@canonical.com>\n" + "From: Jeremy Kerr <jeremy.kerr-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>\n" "\n" "Based on work by Ben Herrenschmidt, this patch adds an of_clk_get\n" "function to allow platforms to retrieve clock data from the device tree.\n" @@ -14,9 +19,9 @@ "called when a device references the provider's OF node for a clock\n" "reference.\n" "\n" - "Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com>\n" - "[grant.likely at secretlab.ca: fix Kconfig conflict]\n" - "Signed-off-by: Grant Likely <grant.likely@secretlab.ca>\n" + "Signed-off-by: Jeremy Kerr <jeremy.kerr-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>\n" + "[grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org: fix Kconfig conflict]\n" + "Signed-off-by: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>\n" "---\n" " drivers/of/Kconfig | 5 ++\n" " drivers/of/Makefile | 1 \n" @@ -235,4 +240,4 @@ "+#endif /* __OF_CLK_H */\n" + -b4df8cbc54c6198d6bc53867d87d025c4a30e2fc68951fe9b133dcb7cdfc13d5 +6140b3fb72cfd7b9811ffb5b8df50763c2ffd089e9b9187a68870f36cb9312e4
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.