diff for duplicates of <4C4980CC.7070909@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 6fcc2cb..4e9ac4e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,7 +1,7 @@ Hello, On 07/23/2010 01:42 PM, Stephen Rothwell wrote: -> On Fri, 23 Jul 2010 13:34:55 +0200 Tejun Heo <tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> wrote: +> On Fri, 23 Jul 2010 13:34:55 +0200 Tejun Heo <tj@kernel.org> wrote: >> >> I was thinking about sending pull request w/ a note describing how to >> resolve the conflict. Would pulling in master before requesting pull diff --git a/a/content_digest b/N1/content_digest index 3318377..0acce80 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,22 +3,21 @@ "ref\020100723213148.3d2193a3.sfr@canb.auug.org.au\0" "ref\04C497E5F.80301@kernel.org\0" "ref\020100723214233.7cb7de8d.sfr@canb.auug.org.au\0" - "ref\020100723214233.7cb7de8d.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org\0" - "From\0Tejun Heo <tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\0" + "From\0Tejun Heo <tj@kernel.org>\0" "Subject\0Re: linux-next: manual merge of the workqueues tree with the Linus' tree\0" "Date\0Fri, 23 Jul 2010 13:45:16 +0200\0" - "To\0Stephen Rothwell <sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>\0" - "Cc\0linux-next-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" - linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> - Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> - " linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" + "To\0Stephen Rothwell <sfr@canb.auug.org.au>\0" + "Cc\0linux-next@vger.kernel.org" + linux-kernel@vger.kernel.org + David Howells <dhowells@redhat.com> + Steve French <smfrench@gmail.com> + " linux-cifs@vger.kernel.org\0" "\00:1\0" "b\0" "Hello,\n" "\n" "On 07/23/2010 01:42 PM, Stephen Rothwell wrote:\n" - "> On Fri, 23 Jul 2010 13:34:55 +0200 Tejun Heo <tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> wrote:\n" + "> On Fri, 23 Jul 2010 13:34:55 +0200 Tejun Heo <tj@kernel.org> wrote:\n" ">>\n" ">> I was thinking about sending pull request w/ a note describing how to\n" ">> resolve the conflict. Would pulling in master before requesting pull\n" @@ -37,4 +36,4 @@ "-- \n" tejun -be38b7eb07b037a7b157ac435cc69e79a47b95745a98e88b34cfac0fbee20579 +9561ab6cb73d2c3d8fae690b480b9a68c119f58b97a3106b78c7a7e51b5d8172
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.