diff for duplicates of <1389986367-4010-2-git-send-email-marc.ceeeee@gmail.com> diff --git a/a/1.txt b/N1/1.txt index da0926a..cbec4e7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,8 +2,8 @@ The BCM7xxx series of Broadcom SoCs are used primarily in set-top boxes. This patch adds machine support for the ARM-based Broadcom SoCs. -Signed-off-by: Marc Carino <marc.ceeeee@gmail.com> -Acked-by: Florian Fainelli <f.fainelli@gmail.com> +Signed-off-by: Marc Carino <marc.ceeeee-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> +Acked-by: Florian Fainelli <f.fainelli-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> --- arch/arm/configs/multi_v7_defconfig | 1 + arch/arm/mach-bcm/Kconfig | 14 ++ @@ -575,7 +575,7 @@ index 0000000..ff4a732 + goto cleanup; + } + -+ /* offset is@top of hif_cont_block */ ++ /* offset is at top of hif_cont_block */ + hif_cont_reg = 0; + +cleanup: @@ -609,3 +609,8 @@ index 0000000..ff4a732 + -- 1.7.1 + +-- +To unsubscribe from this list: send the line "unsubscribe devicetree" in +the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index eb903a3..005a6a9 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,16 +1,25 @@ "ref\01389986367-4010-1-git-send-email-marc.ceeeee@gmail.com\0" - "From\0marc.ceeeee@gmail.com (Marc Carino)\0" + "ref\01389986367-4010-1-git-send-email-marc.ceeeee-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org\0" + "From\0Marc Carino <marc.ceeeee-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" "Subject\0[PATCH v4 1/8] ARM: brcmstb: add infrastructure for ARM-based Broadcom STB SoCs\0" "Date\0Fri, 17 Jan 2014 11:19:20 -0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Christian Daudt <bcm-xK7y4jjYLqYh9ZMKESR00Q@public.gmane.org>" + " Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>\0" + "Cc\0Florian Fainelli <f.fainelli-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>" + Matt Porter <matt.porter-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> + Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org> + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + " Marc Carino <marc.ceeeee-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" "\00:1\0" "b\0" "The BCM7xxx series of Broadcom SoCs are used primarily in set-top boxes.\n" "\n" "This patch adds machine support for the ARM-based Broadcom SoCs.\n" "\n" - "Signed-off-by: Marc Carino <marc.ceeeee@gmail.com>\n" - "Acked-by: Florian Fainelli <f.fainelli@gmail.com>\n" + "Signed-off-by: Marc Carino <marc.ceeeee-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n" + "Acked-by: Florian Fainelli <f.fainelli-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n" "---\n" " arch/arm/configs/multi_v7_defconfig | 1 +\n" " arch/arm/mach-bcm/Kconfig | 14 ++\n" @@ -582,7 +591,7 @@ "+\t\tgoto cleanup;\n" "+\t}\n" "+\n" - "+\t/* offset is@top of hif_cont_block */\n" + "+\t/* offset is at top of hif_cont_block */\n" "+\thif_cont_reg = 0;\n" "+\n" "+cleanup:\n" @@ -615,6 +624,11 @@ "+}\n" "+\n" "-- \n" - 1.7.1 + "1.7.1\n" + "\n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n" + "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -2fe8d77d872dc75d46b7c2bd0ba43b82f6c36bf47b9f20caf62584f585c5726a +345c3a8b4e4d356ed1c284971fdf01502a4ec80bd16cb46abdf81c8049fd89f8
diff --git a/a/1.txt b/N2/1.txt index da0926a..fb0cb82 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -575,7 +575,7 @@ index 0000000..ff4a732 + goto cleanup; + } + -+ /* offset is@top of hif_cont_block */ ++ /* offset is at top of hif_cont_block */ + hif_cont_reg = 0; + +cleanup: diff --git a/a/content_digest b/N2/content_digest index eb903a3..cffa419 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,16 @@ "ref\01389986367-4010-1-git-send-email-marc.ceeeee@gmail.com\0" - "From\0marc.ceeeee@gmail.com (Marc Carino)\0" + "From\0Marc Carino <marc.ceeeee@gmail.com>\0" "Subject\0[PATCH v4 1/8] ARM: brcmstb: add infrastructure for ARM-based Broadcom STB SoCs\0" "Date\0Fri, 17 Jan 2014 11:19:20 -0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Christian Daudt <bcm@fixthebug.org>" + " Arnd Bergmann <arnd@arndb.de>\0" + "Cc\0Florian Fainelli <f.fainelli@gmail.com>" + Matt Porter <matt.porter@linaro.org> + Russell King <linux@arm.linux.org.uk> + linux-arm-kernel@lists.infradead.org + linux-kernel@vger.kernel.org + devicetree@vger.kernel.org + " Marc Carino <marc.ceeeee@gmail.com>\0" "\00:1\0" "b\0" "The BCM7xxx series of Broadcom SoCs are used primarily in set-top boxes.\n" @@ -582,7 +590,7 @@ "+\t\tgoto cleanup;\n" "+\t}\n" "+\n" - "+\t/* offset is@top of hif_cont_block */\n" + "+\t/* offset is at top of hif_cont_block */\n" "+\thif_cont_reg = 0;\n" "+\n" "+cleanup:\n" @@ -617,4 +625,4 @@ "-- \n" 1.7.1 -2fe8d77d872dc75d46b7c2bd0ba43b82f6c36bf47b9f20caf62584f585c5726a +b25df5aebb2b3913dccd0f61e7b9297146162e7b0ce883f053a6fe8cec646d80
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.