diff for duplicates of <5716289B.4060302@ti.com> diff --git a/a/1.txt b/N1/1.txt index 2d539ba..7604341 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -119,7 +119,3 @@ I'd be happy to test the branch again after you've incorporated all changes. Since you are gong to do a push -f anyways, I was wondering if you want to pull in my gpmc branch first to avoid the merge conflict. But it is totally up to you. - --- -cheers, --roger diff --git a/a/content_digest b/N1/content_digest index 9be4e7c..e1c9e6c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -20,16 +20,16 @@ "Date\0Tue, 19 Apr 2016 15:46:19 +0300\0" "To\0Boris Brezillon <boris.brezillon@free-electrons.com>\0" "Cc\0Tony Lindgren <tony@atomide.com>" - <javier@dowhile0.org> - <fcooper@ti.com> - <nsekhar@ti.com> - <linux-mtd@lists.infradead.org> - <linux-omap@vger.kernel.org> - <computersforpeace@gmail.com> - <dwmw2@infradead.org> - <ezequiel@vanguardiasur.com.ar> - <devicetree@vger.kernel.org> - " <linux-kernel@vger.kernel.org>\0" + javier@dowhile0.org + fcooper@ti.com + nsekhar@ti.com + linux-mtd@lists.infradead.org + linux-omap@vger.kernel.org + computersforpeace@gmail.com + dwmw2@infradead.org + ezequiel@vanguardiasur.com.ar + devicetree@vger.kernel.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "Boris,\n" @@ -152,10 +152,6 @@ "I'd be happy to test the branch again after you've incorporated all changes.\n" "\n" "Since you are gong to do a push -f anyways, I was wondering if you want to pull in my\n" - "gpmc branch first to avoid the merge conflict. But it is totally up to you.\n" - "\n" - "--\n" - "cheers,\n" - -roger + gpmc branch first to avoid the merge conflict. But it is totally up to you. -d8b76d8d0cd3f3fc169285cceefef5beb838007372939a00971dc6de165865ee +4d7c85cbe227ec1c6d91aad79459eef44bbeb931a657339e326461417d64aa64
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.