diff for duplicates of <7h4kzg7rev.fsf@baylibre.com> diff --git a/a/1.txt b/N1/1.txt index d91a246..7d7bc26 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -32,6 +32,6 @@ conflict. Kevin _______________________________________________ -linux-amlogic mailing list -linux-amlogic@lists.infradead.org -http://lists.infradead.org/mailman/listinfo/linux-amlogic +linux-arm-kernel mailing list +linux-arm-kernel@lists.infradead.org +http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/a/content_digest b/N1/content_digest index 32ebc9f..250cad7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -46,8 +46,8 @@ "Kevin\n" "\n" "_______________________________________________\n" - "linux-amlogic mailing list\n" - "linux-amlogic@lists.infradead.org\n" - http://lists.infradead.org/mailman/listinfo/linux-amlogic + "linux-arm-kernel mailing list\n" + "linux-arm-kernel@lists.infradead.org\n" + http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -e0f84e5f491588a2062f28b5c95bfdd91782af88b2a84d9ddb8137744771622e +97f4702911fdc434c21c3f10527ae0fdeb41394228a92f898179a9a1f869cdbe
diff --git a/a/1.txt b/N2/1.txt index d91a246..37e2ab2 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -30,8 +30,3 @@ This node doesn't exist upstream... conflict. Kevin - -_______________________________________________ -linux-amlogic mailing list -linux-amlogic@lists.infradead.org -http://lists.infradead.org/mailman/listinfo/linux-amlogic diff --git a/a/content_digest b/N2/content_digest index 32ebc9f..3ae7858 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -43,11 +43,6 @@ "... and these two were present so were removed after manual fix of the\n" "conflict.\n" "\n" - "Kevin\n" - "\n" - "_______________________________________________\n" - "linux-amlogic mailing list\n" - "linux-amlogic@lists.infradead.org\n" - http://lists.infradead.org/mailman/listinfo/linux-amlogic + Kevin -e0f84e5f491588a2062f28b5c95bfdd91782af88b2a84d9ddb8137744771622e +495e1a5147fd69196d8ba83e722b0b816e200d214254390b25108cc05a1a48b9
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.